Do not include <cstring> in <dcmtk/ofstd/ofdefine.h>.

Removed #include <cstring> from the ofdefine.h header file in order to permit its use in C code. Added explicit #include statements in files that previously relied on implicit inclusion through ofdefine.h.
DCMTK · Aug 26, 2024 · 6621c27 · 6621c27
1 parent 1b7d671
commit 6621c27
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 7 deletions.
diff --git a/dcmdata/include/dcmtk/dcmdata/dcdicent.h b/dcmdata/include/dcmtk/dcmdata/dcdicent.h
@@ -25,6 +25,7 @@
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
 #include "dcmtk/dcmdata/dctagkey.h"
 #include "dcmtk/dcmdata/dcvr.h"
+#include <cstring>
 
 /// constant describing an unlimited VM
 #define DcmVariableVM   -1

diff --git a/dcmdata/include/dcmtk/dcmdata/dcrleenc.h b/dcmdata/include/dcmtk/dcmdata/dcrleenc.h
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright (C) 2002-2022, OFFIS e.V.
+ *  Copyright (C) 2002-2024, OFFIS e.V.
  *  All rights reserved.  See COPYRIGHT file for details.
  *
  *  This software and supporting documentation were developed by
@@ -25,6 +25,7 @@
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/ofstd/oflist.h"   /* for class OFList<> */
 #include "dcmtk/dcmdata/dcdefine.h"
+#include <cstring>
 
 #define DcmRLEEncoder_BLOCKSIZE 16384
 

diff --git a/dcmdata/libsrc/dcvr.cc b/dcmdata/libsrc/dcvr.cc
@@ -24,6 +24,7 @@
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
 #include "dcmtk/dcmdata/dcvr.h"
 #include "dcmtk/dcmdata/dctypes.h"
+#include <cstring>
 
 /*
 ** global flags

diff --git a/dcmdata/libsrc/dcxfer.cc b/dcmdata/libsrc/dcxfer.cc
@@ -22,6 +22,7 @@
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
 #include "dcmtk/dcmdata/dcxfer.h"
 #include "dcmtk/dcmdata/dcuid.h"
+#include <cstring>
 
 typedef struct
 {

diff --git a/dcmimgle/apps/dcod2lum.cc b/dcmimgle/apps/dcod2lum.cc
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright (C) 2002-2021, OFFIS e.V.
+ *  Copyright (C) 2002-2024, OFFIS e.V.
  *  All rights reserved.  See COPYRIGHT file for details.
  *
  *  This software and supporting documentation were developed by
@@ -26,6 +26,7 @@
 #include "dcmtk/ofstd/ofconsol.h"
 #include "dcmtk/dcmimgle/didispfn.h"
 #include "dcmtk/dcmdata/dcuid.h"    /* for dcmtk version name */
+#include <cstring>
 
 
 #define OFFIS_CONSOLE_APPLICATION "dcod2lum"

diff --git a/dcmimgle/libsrc/diciefn.cc b/dcmimgle/libsrc/diciefn.cc
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright (C) 1998-2021, OFFIS e.V.
+ *  Copyright (C) 1998-2024, OFFIS e.V.
  *  All rights reserved.  See COPYRIGHT file for details.
  *
  *  This software and supporting documentation were developed by
@@ -24,6 +24,7 @@
 
 #include "dcmtk/dcmimgle/diciefn.h"
 #include "dcmtk/ofstd/ofstream.h"
+#include <cstring>
 
 /*----------------*
  *  constructors  *

diff --git a/dcmimgle/libsrc/digsdfn.cc b/dcmimgle/libsrc/digsdfn.cc
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright (C) 1999-2021, OFFIS e.V.
+ *  Copyright (C) 1999-2024, OFFIS e.V.
  *  All rights reserved.  See COPYRIGHT file for details.
  *
  *  This software and supporting documentation were developed by
@@ -29,6 +29,7 @@
 #include "dcmtk/ofstd/ofstream.h"
 
 #include <cmath>
+#include <cstring>
 
 /*----------------------------*
  *  constant initializations  *

diff --git a/dcmnet/libsrc/dccfuidh.cc b/dcmnet/libsrc/dccfuidh.cc
@@ -1,6 +1,6 @@
 /*
  *
- *  Copyright (C) 1994-2021, OFFIS e.V.
+ *  Copyright (C) 1994-2024, OFFIS e.V.
  *  All rights reserved.  See COPYRIGHT file for details.
  *
  *  This software and supporting documentation were developed by
@@ -25,6 +25,7 @@
 
 #include "dcmtk/dcmdata/dcuid.h"    /* for dcmFindUIDFromName() */
 #include "dcmtk/dcmdata/dcxfer.h"   /* for gLocalByteOrder */
+#include <cstring>
 
 #define SymbolicUID_LocalEndianExplicit    "LocalEndianExplicit"
 #define SymbolicUID_OppositeEndianExplicit "OppositeEndianExplicit"

diff --git a/ofstd/include/dcmtk/ofstd/ofdefine.h b/ofstd/include/dcmtk/ofstd/ofdefine.h
@@ -26,8 +26,6 @@
 #include "dcmtk/ofstd/ofcast.h"
 #include "dcmtk/ofstd/ofexport.h"
 
-#include <cstring>
-
 #ifdef ofstd_EXPORTS
 #define DCMTK_OFSTD_EXPORT DCMTK_DECL_EXPORT
 #else