From d383623628bfa9cca9143fdcbae668045e9f05a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Matos?= Date: Thu, 9 Jul 2026 11:06:22 +0100 Subject: [PATCH] Remove generated Inventor/system/inttypes header --- CMakeLists.txt | 16 -- include/CMakeLists.txt | 1 - include/Inventor/C/basic.h.cmake.in | 16 +- include/Inventor/C/basic.h.in | 16 +- include/Inventor/SbColor.h | 1 - include/Inventor/SbColor4f.h | 1 - include/Inventor/SbString.h | 1 - include/Inventor/SbTime.h | 2 +- include/Inventor/SbTypeInfo.h | 1 - include/Inventor/SbVec2b.h | 1 - include/Inventor/SbVec2i32.h | 1 - include/Inventor/SbVec2s.h | 1 - include/Inventor/SbVec2ub.h | 1 - include/Inventor/SbVec2ui32.h | 1 - include/Inventor/SbVec2us.h | 1 - include/Inventor/SbVec3b.h | 1 - include/Inventor/SbVec3i32.h | 1 - include/Inventor/SbVec3ub.h | 1 - include/Inventor/SbVec3ui32.h | 1 - include/Inventor/SbVec3us.h | 1 - include/Inventor/SbVec4b.h | 1 - include/Inventor/SbVec4i32.h | 1 - include/Inventor/SbVec4s.h | 1 - include/Inventor/SbVec4ub.h | 1 - include/Inventor/SbVec4ui32.h | 1 - include/Inventor/SbVec4us.h | 1 - include/Inventor/SoInput.h | 1 - include/Inventor/SoOutput.h | 1 - include/Inventor/SoPrimitiveVertex.h | 1 - include/Inventor/actions/SoGLRenderAction.h | 1 - include/Inventor/bundles/SoMaterialBundle.h | 1 - .../bundles/SoTextureCoordinateBundle.h | 1 - include/Inventor/caches/SoConvexDataCache.h | 1 - include/Inventor/caches/SoNormalCache.h | 1 - include/Inventor/elements/SoInt32Element.h | 1 - include/Inventor/elements/SoOverrideElement.h | 1 - include/Inventor/elements/SoReplacedElement.h | 1 - include/Inventor/misc/SoByteStream.h | 1 - include/Inventor/misc/SoNormalGenerator.h | 1 - include/Inventor/sensors/SoDelayQueueSensor.h | 1 - include/Inventor/system/Makefile.am | 13 +- include/Inventor/system/Makefile.in | 13 +- include/Inventor/system/inttypes.h.cmake.in | 186 ------------------ include/Inventor/system/inttypes.h.in | 186 ------------------ src/3ds/SoStream.h | 1 - src/config.h.cmake.in | 72 ------- src/config.h.in | 81 -------- src/discard.h.in | 81 -------- src/engines/so_eval.ic | 4 +- src/fonts/builtin2dfonts.icc | 2 +- src/fonts/defaultfonts.h | 1 - src/fonts/extractfont.cpp | 2 +- src/fonts/freetype.cpp | 2 - src/foreignfiles/steel.cpp | 6 +- src/foreignfiles/steel.l | 2 +- src/glue/freetype.cpp | 2 - src/glue/zlib.h | 1 + src/io/SoInput.cpp | 2 - src/io/gzmemio.h | 3 +- src/misc/SoDB.cpp | 5 +- src/misc/SoGenerate.h | 1 - src/misc/SoPick.h | 1 - src/misc/systemsanity.icc | 4 - src/scxml/eval-minimum.cpp | 4 +- src/soscxml/eval-coin.cpp | 4 +- src/unconfig.h | 97 +-------- 66 files changed, 38 insertions(+), 824 deletions(-) delete mode 100644 include/Inventor/system/inttypes.h.cmake.in delete mode 100644 include/Inventor/system/inttypes.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 306232593e..a7abc4f691 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,18 +529,6 @@ foreach (_config ${CMAKE_CONFIGURATION_TYPES}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${_config} "${CMAKE_BINARY_DIR}/bin") endforeach() -# Checks for existence of specified types and set variable to the first type found -coin_find_int_type_with_size(COIN_INT8_T 1 "int8_t" "char") -coin_find_int_type_with_size(COIN_UINT8_T 1 "uint8_t" "u_int8_t" "unsigned char") -coin_find_int_type_with_size(COIN_INT16_T 2 "int16_t" "short" "int") -coin_find_int_type_with_size(COIN_UINT16_T 2 "uint16_t" "u_int16_t" "unsigned short" "unsigned int") -coin_find_int_type_with_size(COIN_INT32_T 4 "int32_t" "int" "long") -coin_find_int_type_with_size(COIN_UINT32_T 4 "uint32_t" "u_int32_t" "unsigned int" "unsigned long") -coin_find_int_type_with_size(COIN_INT64_T 8 "int64_t" "long" "int" "long long" "__int64") -coin_find_int_type_with_size(COIN_UINT64_T 8 "uint64_t" "u_int64_t" "unsigned long" "unsigned int" "unsigned long long" "unsigned __int64") -coin_find_int_type_with_size(COIN_INTPTR_T ${CMAKE_SIZEOF_VOID_P} "intptr_t" "int" "long" "long long" "__int64") -coin_find_int_type_with_size(COIN_UINTPTR_T ${CMAKE_SIZEOF_VOID_P} "uintptr_t" "u_intptr_t" "_W64 unsigned int" "unsigned int" "unsigned long" "u_int64_t" "unsigned long long" "unsigned __int64") - if(MSVC) option(COIN_BUILD_MSVC_STATIC_RUNTIME "Build against the static Microsoft Visual C runtime library." OFF) option(COIN_BUILD_SINGLE_LIB "Build only one library when ON, multiple when OFF." ON) @@ -650,13 +638,9 @@ else() set(COIN_DEBUG_SYSTEM_LIBRARY_NAME "$") endif() -check_include_file(inttypes.h HAVE_INTTYPES_H) -check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stddef.h HAVE_STDDEF_H) check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(sys/time.h HAVE_SYS_TIME_H) check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H) -check_include_file(sys/types.h HAVE_SYS_TYPES_H) check_include_file(sys/stat.h HAVE_SYS_STAT_H) check_include_file(sys/param.h HAVE_SYS_PARAM_H) check_include_file(io.h HAVE_IO_H) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 08ba516780..17d95db238 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,6 +1,5 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Inventor/C/basic.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Inventor/C/basic.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Inventor/system/gl-headers.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Inventor/system/gl-headers.h) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Inventor/system/inttypes.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Inventor/system/inttypes.h) file(GLOB_RECURSE COMMON_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/Inventor/*.h) file(GLOB_RECURSE COMMON_BIN_HDRS ${CMAKE_CURRENT_BINARY_DIR}/Inventor/*.h) diff --git a/include/Inventor/C/basic.h.cmake.in b/include/Inventor/C/basic.h.cmake.in index 44403ce916..088d24f06f 100644 --- a/include/Inventor/C/basic.h.cmake.in +++ b/include/Inventor/C/basic.h.cmake.in @@ -81,18 +81,12 @@ static const SbBool TRUE = 1; /* *********************************************************************** */ -/* Include this to 1) be compatible with Open Inventor's SbBasic.h, 2) - * provide a way for application programmers to get hold of the type - * definitions without explicitly including inttypes.h. - * - * The latter point is important because the inttypes.h file in SGI - * and TGS Open Inventor is placed _below_ the Inventor/ directory in - * the header files hierarchy. This is a stupid thing to do because it - * could easily conflict with the inttypes.h file installed as part of - * the C library on many systems (like GNU/Linux's glibc, for - * instance). +/* Include these to 1) be compatible with Open Inventor's SbBasic.h, 2) + * provide the standard size/difference and fixed-width integer types + * used throughout Coin headers. */ -#include +#include +#include /* Internal note for Coin developers: in other sourcefiles in Coin, we * depend on math.h being included through SbBasic.h. It is done this diff --git a/include/Inventor/C/basic.h.in b/include/Inventor/C/basic.h.in index 525c18aa89..b7c847d7cc 100644 --- a/include/Inventor/C/basic.h.in +++ b/include/Inventor/C/basic.h.in @@ -80,18 +80,12 @@ static const SbBool TRUE = 1; /* *********************************************************************** */ -/* Include this to 1) be compatible with Open Inventor's SbBasic.h, 2) - * provide a way for application programmers to get hold of the type - * definitions without explicitly including inttypes.h. - * - * The latter point is important because the inttypes.h file in SGI - * and TGS Open Inventor is placed _below_ the Inventor/ directory in - * the header files hierarchy. This is a stupid thing to do because it - * could easily conflict with the inttypes.h file installed as part of - * the C library on many systems (like GNU/Linux's glibc, for - * instance). +/* Include these to 1) be compatible with Open Inventor's SbBasic.h, 2) + * provide the standard size/difference and fixed-width integer types + * used throughout Coin headers. */ -#include +#include +#include /* Internal note for Coin developers: in other sourcefiles in Coin, we * depend on math.h being included through SbBasic.h. It is done this diff --git a/include/Inventor/SbColor.h b/include/Inventor/SbColor.h index c070f7f1cc..93dea1cb55 100644 --- a/include/Inventor/SbColor.h +++ b/include/Inventor/SbColor.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#include #include class COIN_DLL_API SbColor : public SbVec3f { diff --git a/include/Inventor/SbColor4f.h b/include/Inventor/SbColor4f.h index 34a1e5733d..8f2d6879bc 100644 --- a/include/Inventor/SbColor4f.h +++ b/include/Inventor/SbColor4f.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#include #include #include diff --git a/include/Inventor/SbString.h b/include/Inventor/SbString.h index 5395ee8f0a..1e3be3acb2 100644 --- a/include/Inventor/SbString.h +++ b/include/Inventor/SbString.h @@ -36,7 +36,6 @@ #include #include -#include #include #ifdef COIN_INTERNAL diff --git a/include/Inventor/SbTime.h b/include/Inventor/SbTime.h index 05283fe3f4..14f6ccbf2d 100644 --- a/include/Inventor/SbTime.h +++ b/include/Inventor/SbTime.h @@ -35,7 +35,7 @@ #include -#include +#include #include #include diff --git a/include/Inventor/SbTypeInfo.h b/include/Inventor/SbTypeInfo.h index ac4286b513..c1d7c2e9be 100644 --- a/include/Inventor/SbTypeInfo.h +++ b/include/Inventor/SbTypeInfo.h @@ -61,7 +61,6 @@ #ifndef DOXYGEN_SKIP_THIS -#include #include // ************************************************************************* diff --git a/include/Inventor/SbVec2b.h b/include/Inventor/SbVec2b.h index f5a1161111..a274a3a6d5 100644 --- a/include/Inventor/SbVec2b.h +++ b/include/Inventor/SbVec2b.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec2i32.h b/include/Inventor/SbVec2i32.h index bac82fafc9..3e9524db5c 100644 --- a/include/Inventor/SbVec2i32.h +++ b/include/Inventor/SbVec2i32.h @@ -36,7 +36,6 @@ #include #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec2s.h b/include/Inventor/SbVec2s.h index 09a278fc92..136bf6d054 100644 --- a/include/Inventor/SbVec2s.h +++ b/include/Inventor/SbVec2s.h @@ -36,7 +36,6 @@ #include #include -#include #include #ifndef NDEBUG #include diff --git a/include/Inventor/SbVec2ub.h b/include/Inventor/SbVec2ub.h index dc14eebcf2..870a1e79ad 100644 --- a/include/Inventor/SbVec2ub.h +++ b/include/Inventor/SbVec2ub.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec2ui32.h b/include/Inventor/SbVec2ui32.h index 0090774b55..54f6cb830c 100644 --- a/include/Inventor/SbVec2ui32.h +++ b/include/Inventor/SbVec2ui32.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec2us.h b/include/Inventor/SbVec2us.h index 5b8e70a60c..5048c9ec21 100644 --- a/include/Inventor/SbVec2us.h +++ b/include/Inventor/SbVec2us.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec3b.h b/include/Inventor/SbVec3b.h index f02cfbe1f1..e967f81043 100644 --- a/include/Inventor/SbVec3b.h +++ b/include/Inventor/SbVec3b.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec3i32.h b/include/Inventor/SbVec3i32.h index 19afa00d23..56b9575ce1 100644 --- a/include/Inventor/SbVec3i32.h +++ b/include/Inventor/SbVec3i32.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec3ub.h b/include/Inventor/SbVec3ub.h index 68c4b23e4e..fbcd2064cf 100644 --- a/include/Inventor/SbVec3ub.h +++ b/include/Inventor/SbVec3ub.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec3ui32.h b/include/Inventor/SbVec3ui32.h index 20f6dc4e0f..5a6235d73b 100644 --- a/include/Inventor/SbVec3ui32.h +++ b/include/Inventor/SbVec3ui32.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec3us.h b/include/Inventor/SbVec3us.h index 1221ebbef8..7c8955d3e7 100644 --- a/include/Inventor/SbVec3us.h +++ b/include/Inventor/SbVec3us.h @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/include/Inventor/SbVec4b.h b/include/Inventor/SbVec4b.h index 7d5babd2ba..3fd0137fbf 100644 --- a/include/Inventor/SbVec4b.h +++ b/include/Inventor/SbVec4b.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec4i32.h b/include/Inventor/SbVec4i32.h index 4d63ec9b3f..5771a1a5ea 100644 --- a/include/Inventor/SbVec4i32.h +++ b/include/Inventor/SbVec4i32.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec4s.h b/include/Inventor/SbVec4s.h index 86e95ce660..fbcd73f0c5 100644 --- a/include/Inventor/SbVec4s.h +++ b/include/Inventor/SbVec4s.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec4ub.h b/include/Inventor/SbVec4ub.h index ae7fa9d58d..284eb2a08f 100644 --- a/include/Inventor/SbVec4ub.h +++ b/include/Inventor/SbVec4ub.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec4ui32.h b/include/Inventor/SbVec4ui32.h index 1c9e55d02c..7b9297fc04 100644 --- a/include/Inventor/SbVec4ui32.h +++ b/include/Inventor/SbVec4ui32.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SbVec4us.h b/include/Inventor/SbVec4us.h index 2dc69e4687..a8b6ac1153 100644 --- a/include/Inventor/SbVec4us.h +++ b/include/Inventor/SbVec4us.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include #ifndef NDEBUG #include #endif // !NDEBUG diff --git a/include/Inventor/SoInput.h b/include/Inventor/SoInput.h index a9f2993fd6..5ea7844d4e 100644 --- a/include/Inventor/SoInput.h +++ b/include/Inventor/SoInput.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#include #include #include #include // FILE diff --git a/include/Inventor/SoOutput.h b/include/Inventor/SoOutput.h index 813e4c531a..7b8fd15dd3 100644 --- a/include/Inventor/SoOutput.h +++ b/include/Inventor/SoOutput.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#include #include #include #include diff --git a/include/Inventor/SoPrimitiveVertex.h b/include/Inventor/SoPrimitiveVertex.h index acbd1d4dcb..12fdf9ebff 100644 --- a/include/Inventor/SoPrimitiveVertex.h +++ b/include/Inventor/SoPrimitiveVertex.h @@ -36,7 +36,6 @@ #include #include #include -#include class SoDetail; diff --git a/include/Inventor/actions/SoGLRenderAction.h b/include/Inventor/actions/SoGLRenderAction.h index 9e39408666..2a7a12a55a 100644 --- a/include/Inventor/actions/SoGLRenderAction.h +++ b/include/Inventor/actions/SoGLRenderAction.h @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/include/Inventor/bundles/SoMaterialBundle.h b/include/Inventor/bundles/SoMaterialBundle.h index 9725d41466..07e3eae46e 100644 --- a/include/Inventor/bundles/SoMaterialBundle.h +++ b/include/Inventor/bundles/SoMaterialBundle.h @@ -35,7 +35,6 @@ #include #include -#include class SoGLLazyElement; diff --git a/include/Inventor/bundles/SoTextureCoordinateBundle.h b/include/Inventor/bundles/SoTextureCoordinateBundle.h index ebc8d55352..25c51abd6b 100644 --- a/include/Inventor/bundles/SoTextureCoordinateBundle.h +++ b/include/Inventor/bundles/SoTextureCoordinateBundle.h @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/include/Inventor/caches/SoConvexDataCache.h b/include/Inventor/caches/SoConvexDataCache.h index bfe94cd6aa..1ace69c9c3 100644 --- a/include/Inventor/caches/SoConvexDataCache.h +++ b/include/Inventor/caches/SoConvexDataCache.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include class SbVec3f; class SoCoordinateElement; diff --git a/include/Inventor/caches/SoNormalCache.h b/include/Inventor/caches/SoNormalCache.h index b821bebc30..7d369542d5 100644 --- a/include/Inventor/caches/SoNormalCache.h +++ b/include/Inventor/caches/SoNormalCache.h @@ -35,7 +35,6 @@ #include #include -#include class SoNormalGenerator; class SoNormalCacheP; diff --git a/include/Inventor/elements/SoInt32Element.h b/include/Inventor/elements/SoInt32Element.h index e5af138365..c0ac55f7d7 100644 --- a/include/Inventor/elements/SoInt32Element.h +++ b/include/Inventor/elements/SoInt32Element.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include class COIN_DLL_API SoInt32Element : public SoElement { typedef SoElement inherited; diff --git a/include/Inventor/elements/SoOverrideElement.h b/include/Inventor/elements/SoOverrideElement.h index 5ebad8090c..fdf233c679 100644 --- a/include/Inventor/elements/SoOverrideElement.h +++ b/include/Inventor/elements/SoOverrideElement.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include class SoType; // lame doxygen "fix" diff --git a/include/Inventor/elements/SoReplacedElement.h b/include/Inventor/elements/SoReplacedElement.h index d87974bf6d..a4b76cca96 100644 --- a/include/Inventor/elements/SoReplacedElement.h +++ b/include/Inventor/elements/SoReplacedElement.h @@ -34,7 +34,6 @@ \**************************************************************************/ #include -#include class COIN_DLL_API SoReplacedElement : public SoElement { typedef SoElement inherited; diff --git a/include/Inventor/misc/SoByteStream.h b/include/Inventor/misc/SoByteStream.h index 0a1100c78a..dca044d697 100644 --- a/include/Inventor/misc/SoByteStream.h +++ b/include/Inventor/misc/SoByteStream.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#include #include class SoNode; diff --git a/include/Inventor/misc/SoNormalGenerator.h b/include/Inventor/misc/SoNormalGenerator.h index cf69a7bfde..15ff0f9659 100644 --- a/include/Inventor/misc/SoNormalGenerator.h +++ b/include/Inventor/misc/SoNormalGenerator.h @@ -36,7 +36,6 @@ #include #include #include -#include class COIN_DLL_API SoNormalGenerator { public: diff --git a/include/Inventor/sensors/SoDelayQueueSensor.h b/include/Inventor/sensors/SoDelayQueueSensor.h index c660bcfa54..3f849062d9 100644 --- a/include/Inventor/sensors/SoDelayQueueSensor.h +++ b/include/Inventor/sensors/SoDelayQueueSensor.h @@ -35,7 +35,6 @@ #include #include -#include class COIN_DLL_API SoDelayQueueSensor : public SoSensor { typedef SoSensor inherited; diff --git a/include/Inventor/system/Makefile.am b/include/Inventor/system/Makefile.am index 443d8ff0aa..93deb08766 100644 --- a/include/Inventor/system/Makefile.am +++ b/include/Inventor/system/Makefile.am @@ -1,27 +1,20 @@ PublicHeaders = \ gl.h \ - gl-headers.h \ - inttypes.h + gl-headers.h PrivateHeaders = \ - gl-headers.h.in \ - inttypes.h.in + gl-headers.h.in ObsoleteHeaders = BUILT_SOURCES = \ - gl-headers.h \ - inttypes.h + gl-headers.h DISTCLEANFILES = \ gl-headers.h \ - inttypes.h \ stamp-h* gl-headers.h: $(srcdir)/gl-headers.h.in $(top_builddir)/config.status @( cd $(top_builddir); $(MAKE) include/Inventor/system/gl-headers.h ) -inttypes.h: $(srcdir)/inttypes.h.in $(top_builddir)/config.status - @( cd $(top_builddir); $(MAKE) include/Inventor/system/inttypes.h ) - ##$ BEGIN TEMPLATE Make-Include-Common(system, system) # ************************************************************************** # This template depends on the following variables having been set up before diff --git a/include/Inventor/system/Makefile.in b/include/Inventor/system/Makefile.in index 7886f0cc1f..a36b088740 100644 --- a/include/Inventor/system/Makefile.in +++ b/include/Inventor/system/Makefile.in @@ -300,21 +300,17 @@ target_os = @target_os@ target_vendor = @target_vendor@ PublicHeaders = \ gl.h \ - gl-headers.h \ - inttypes.h + gl-headers.h PrivateHeaders = \ - gl-headers.h.in \ - inttypes.h.in + gl-headers.h.in ObsoleteHeaders = BUILT_SOURCES = \ - gl-headers.h \ - inttypes.h + gl-headers.h DISTCLEANFILES = \ gl-headers.h \ - inttypes.h \ stamp-h* @@ -560,9 +556,6 @@ uninstall-am: uninstall-info-am uninstall-libsystemincHEADERS gl-headers.h: $(srcdir)/gl-headers.h.in $(top_builddir)/config.status @( cd $(top_builddir); $(MAKE) include/Inventor/system/gl-headers.h ) -inttypes.h: $(srcdir)/inttypes.h.in $(top_builddir)/config.status - @( cd $(top_builddir); $(MAKE) include/Inventor/system/inttypes.h ) - install-libsystemincHEADERS: $(libsysteminc_HEADERS) @$(NORMAL_INSTALL) @if test x"$(libsysteminc_HEADERS)" = x""; then :; else \ diff --git a/include/Inventor/system/inttypes.h.cmake.in b/include/Inventor/system/inttypes.h.cmake.in deleted file mode 100644 index c5ed4509f6..0000000000 --- a/include/Inventor/system/inttypes.h.cmake.in +++ /dev/null @@ -1,186 +0,0 @@ -/* include/Inventor/system/inttypes.h. Generated from inttypes.h.cmake.in by CMake. */ -#ifndef COIN_INTTYPES_H -#define COIN_INTTYPES_H - -/**************************************************************************\ - * Copyright (c) Kongsberg Oil & Gas Technologies AS - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -\**************************************************************************/ - -/* - This file defines the following types: - - int8_t uint8_t - int16_t uint16_t - int32_t uint32_t - int64_t uint64_t - intptr_t uintptr_t - - (The 64-bit types are not guaranteed to be present, check for - HAVE_INT64_T and HAVE_UINT64_T.) -*/ - -/***************************************************************************/ - -/* Block of defines set up by the configure script. Protected with the - #ifndef wrapper in case config.h was already included -- so we - don't confuse the compiler to think we redefine already #define'd - constants. */ -#ifndef COIN_CONFIGURE_BUILD /* (start wrapper) */ - -/* - This file was autogenerated by our configuration process - specifically for this build configuration: -*/ -#define COIN_CONFIGURE_HOST @CMAKE_HOST_SYSTEM_PROCESSOR@_@CMAKE_HOST_SYSTEM_NAME@ -#define COIN_CONFIGURE_TARGET @CMAKE_SYSTEM_PROCESSOR@_@CMAKE_SYSTEM_NAME@ -/* - The bit-type definitions may also be dependent on the compiler, - compiler version and C library. - - So note that the bit-type definitions below might not match on other - systems. Be extremely careful if you for whatever reason is - installing this as a cross-platform header file (i.e.: you - shouldn't). -*/ - -/* FIXME: isn't it likely that the HAVE_*_H defines below could crash - with defines in application code in a project using Autoconf - configure? 20010711 mortene. */ - -/* The header file. */ -#cmakedefine HAVE_INTTYPES_H 1 -/* The header file. */ -#cmakedefine HAVE_STDINT_H 1 -/* The header file. */ -#cmakedefine HAVE_SYS_TYPES_H 1 -/* The header file. */ -#cmakedefine HAVE_STDDEF_H 1 - - -/* If the system defines any of the types "on it's own", the - respective #define will be set below. */ -#cmakedefine HAVE_INT8_T 1 -#cmakedefine HAVE_UINT8_T 1 -#cmakedefine HAVE_INT16_T 1 -#cmakedefine HAVE_UINT16_T 1 -#cmakedefine HAVE_INT32_T 1 -#cmakedefine HAVE_UINT32_T 1 -#cmakedefine HAVE_INT64_T 1 -#cmakedefine HAVE_UINT64_T 1 -#cmakedefine HAVE_INTPTR_T 1 -#cmakedefine HAVE_UINTPTR_T 1 - -/* The type which the configure script found to match the given - bitwidth. */ -#cmakedefine COIN_INT8_T @COIN_INT8_T@ -#cmakedefine COIN_UINT8_T @COIN_UINT8_T@ -#cmakedefine COIN_INT16_T @COIN_INT16_T@ -#cmakedefine COIN_UINT16_T @COIN_UINT16_T@ -#cmakedefine COIN_INT32_T @COIN_INT32_T@ -#cmakedefine COIN_UINT32_T @COIN_UINT32_T@ -#cmakedefine COIN_INT64_T @COIN_INT64_T@ -#cmakedefine COIN_UINT64_T @COIN_UINT64_T@ -#cmakedefine COIN_INTPTR_T @COIN_INTPTR_T@ -#cmakedefine COIN_UINTPTR_T @COIN_UINTPTR_T@ - -#endif /* (end wrapper) ! COIN_CONFIGURE_BUILD */ - - -/* The header files should be listed in the same order as they are in - the SIM_AC_DEFINE_BYTESIZE_TYPES detection macro. This is the same - order as the one Autoconf (currently upcoming 2.51) is using for its - standard includes. 20010711 larsa */ -#ifdef HAVE_INTTYPES_H -#include -#else -#ifdef HAVE_STDINT_H -#include -#endif /* HAVE_STDINT_H */ -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_STDDEF_H -#include -#endif /* HAVE_STDDEF_H */ - - -#if !defined(HAVE_INT8_T) && defined(COIN_INT8_T) -typedef COIN_INT8_T int8_t; -#define HAVE_INT8_T 1 -#endif /* !HAVE_INT8_T && COIN_INT8_T */ - -#if !defined(HAVE_UINT8_T) && defined(COIN_UINT8_T) -typedef COIN_UINT8_T uint8_t; -#define HAVE_UINT8_T 1 -#endif /* !HAVE_UINT8_T && COIN_UINT8_T */ - -#if !defined(HAVE_INT16_T) && defined(COIN_INT16_T) -typedef COIN_INT16_T int16_t; -#define HAVE_INT16_T 1 -#endif /* !HAVE_INT16_T && COIN_INT16_T */ - -#if !defined(HAVE_UINT16_T) && defined(COIN_UINT16_T) -typedef COIN_UINT16_T uint16_t; -#define HAVE_UINT16_T 1 -#endif /* !HAVE_UINT16_T && COIN_UINT16_T */ - -#if !defined(HAVE_INT32_T) && defined(COIN_INT32_T) -typedef COIN_INT32_T int32_t; -#define HAVE_INT32_T 1 -#endif /* !HAVE_INT32_T && COIN_INT32_T */ - -#if !defined(HAVE_UINT32_T) && defined(COIN_UINT32_T) -typedef COIN_UINT32_T uint32_t; -#define HAVE_UINT32_T 1 -#endif /* !HAVE_UINT32_T && COIN_UINT32_T */ - -#if !defined(HAVE_INT64_T) && defined(COIN_INT64_T) -typedef COIN_INT64_T int64_t; -#define HAVE_INT64_T 1 -#endif /* !HAVE_INT64_T && COIN_INT64_T */ - -#if !defined(HAVE_UINT64_T) && defined(COIN_UINT64_T) -typedef COIN_UINT64_T uint64_t; -#define HAVE_UINT64_T 1 -#endif /* !HAVE_UINT64_T && COIN_UINT64_T */ - -#if !defined(HAVE_INTPTR_T) && defined(COIN_INTPTR_T) -typedef COIN_INTPTR_T intptr_t; -#define HAVE_INTPTR_T 1 -#endif /* !HAVE_INTPTR_T && COIN_INTPTR_T */ - -#if !defined(HAVE_UINTPTR_T) && defined(COIN_UINTPTR_T) -typedef COIN_UINTPTR_T uintptr_t; -#define HAVE_UINTPTR_T 1 -#endif /* !HAVE_UINTPTR_T && COIN_UINTPTR_T */ - -#endif /* !COIN_INTTYPES_H */ diff --git a/include/Inventor/system/inttypes.h.in b/include/Inventor/system/inttypes.h.in deleted file mode 100644 index 26d3646c55..0000000000 --- a/include/Inventor/system/inttypes.h.in +++ /dev/null @@ -1,186 +0,0 @@ -#ifndef COIN_INTTYPES_H -#define COIN_INTTYPES_H - -/**************************************************************************\ - * Copyright (c) Kongsberg Oil & Gas Technologies AS - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -\**************************************************************************/ - -/* - This file defines the following types: - - int8_t uint8_t - int16_t uint16_t - int32_t uint32_t - int64_t uint64_t - intptr_t uintptr_t - - (The 64-bit types are not guaranteed to be present, check for - HAVE_INT64_T and HAVE_UINT64_T.) -*/ - -/***************************************************************************/ - -/* Block of defines set up by the configure script. Protected with the - #ifndef wrapper in case config.h was already included -- so we - don't confuse the compiler to think we redefine already #define'd - constants. */ -#ifndef COIN_CONFIGURE_BUILD /* (start wrapper) */ - -/* - This file was autogenerated by our configuration process - specifically for this build configuration: -*/ -#undef COIN_CONFIGURE_BUILD -#undef COIN_CONFIGURE_HOST -#undef COIN_CONFIGURE_TARGET -/* - The bit-type definitions may also be dependent on the compiler, - compiler version and C library. - - So note that the bit-type definitions below might not match on other - systems. Be extremely careful if you for whatever reason is - installing this as a cross-platform header file (i.e.: you - shouldn't). -*/ - -/* FIXME: isn't it likely that the HAVE_*_H defines below could crash - with defines in application code in a project using Autoconf - configure? 20010711 mortene. */ - -/* The header file. */ -#undef HAVE_INTTYPES_H -/* The header file. */ -#undef HAVE_STDINT_H -/* The header file. */ -#undef HAVE_SYS_TYPES_H -/* The header file. */ -#undef HAVE_STDDEF_H - - -/* If the system defines any of the types "on it's own", the - respective #define will be set below. */ -#undef HAVE_INT8_T -#undef HAVE_UINT8_T -#undef HAVE_INT16_T -#undef HAVE_UINT16_T -#undef HAVE_INT32_T -#undef HAVE_UINT32_T -#undef HAVE_INT64_T -#undef HAVE_UINT64_T -#undef HAVE_INTPTR_T -#undef HAVE_UINTPTR_T - -/* The type which the configure script found to match the given - bitwidth. */ -#undef COIN_INT8_T -#undef COIN_UINT8_T -#undef COIN_INT16_T -#undef COIN_UINT16_T -#undef COIN_INT32_T -#undef COIN_UINT32_T -#undef COIN_INT64_T -#undef COIN_UINT64_T -#undef COIN_INTPTR_T -#undef COIN_UINTPTR_T - -#endif /* (end wrapper) ! COIN_CONFIGURE_BUILD */ - - -/* The header files should be listed in the same order as they are in - the SIM_AC_DEFINE_BYTESIZE_TYPES detection macro. This is the same - order as the one Autoconf (currently upcoming 2.51) is using for its - standard includes. 20010711 larsa */ -#ifdef HAVE_INTTYPES_H -#include -#else -#ifdef HAVE_STDINT_H -#include -#endif /* HAVE_STDINT_H */ -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_STDDEF_H -#include -#endif /* HAVE_STDDEF_H */ - - -#if !defined(HAVE_INT8_T) && defined(COIN_INT8_T) -typedef COIN_INT8_T int8_t; -#define HAVE_INT8_T 1 -#endif /* !HAVE_INT8_T && COIN_INT8_T */ - -#if !defined(HAVE_UINT8_T) && defined(COIN_UINT8_T) -typedef COIN_UINT8_T uint8_t; -#define HAVE_UINT8_T 1 -#endif /* !HAVE_UINT8_T && COIN_UINT8_T */ - -#if !defined(HAVE_INT16_T) && defined(COIN_INT16_T) -typedef COIN_INT16_T int16_t; -#define HAVE_INT16_T 1 -#endif /* !HAVE_INT16_T && COIN_INT16_T */ - -#if !defined(HAVE_UINT16_T) && defined(COIN_UINT16_T) -typedef COIN_UINT16_T uint16_t; -#define HAVE_UINT16_T 1 -#endif /* !HAVE_UINT16_T && COIN_UINT16_T */ - -#if !defined(HAVE_INT32_T) && defined(COIN_INT32_T) -typedef COIN_INT32_T int32_t; -#define HAVE_INT32_T 1 -#endif /* !HAVE_INT32_T && COIN_INT32_T */ - -#if !defined(HAVE_UINT32_T) && defined(COIN_UINT32_T) -typedef COIN_UINT32_T uint32_t; -#define HAVE_UINT32_T 1 -#endif /* !HAVE_UINT32_T && COIN_UINT32_T */ - -#if !defined(HAVE_INT64_T) && defined(COIN_INT64_T) -typedef COIN_INT64_T int64_t; -#define HAVE_INT64_T 1 -#endif /* !HAVE_INT64_T && COIN_INT64_T */ - -#if !defined(HAVE_UINT64_T) && defined(COIN_UINT64_T) -typedef COIN_UINT64_T uint64_t; -#define HAVE_UINT64_T 1 -#endif /* !HAVE_UINT64_T && COIN_UINT64_T */ - -#if !defined(HAVE_INTPTR_T) && defined(COIN_INTPTR_T) -typedef COIN_INTPTR_T intptr_t; -#define HAVE_INTPTR_T 1 -#endif /* !HAVE_INTPTR_T && COIN_INTPTR_T */ - -#if !defined(HAVE_UINTPTR_T) && defined(COIN_UINTPTR_T) -typedef COIN_UINTPTR_T uintptr_t; -#define HAVE_UINTPTR_T 1 -#endif /* !HAVE_UINTPTR_T && COIN_UINTPTR_T */ - -#endif /* !COIN_INTTYPES_H */ diff --git a/src/3ds/SoStream.h b/src/3ds/SoStream.h index 31af0cea11..91a39ca487 100644 --- a/src/3ds/SoStream.h +++ b/src/3ds/SoStream.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \**************************************************************************/ -#include #include #include diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in index 916ebc7f9e..819ce9a6e5 100644 --- a/src/config.h.cmake.in +++ b/src/config.h.cmake.in @@ -12,21 +12,6 @@ /* define this to the libCoin beta version letter */ #define COIN_BETA_VERSION @COIN_BETA_VERSION@ -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_INT16_T @COIN_INT16_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_INT32_T @COIN_INT32_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_INT64_T @COIN_INT64_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_INT8_T @COIN_INT8_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_INTPTR_T @COIN_INTPTR_T@ - /* Define when building Mac OS X framework */ #cmakedefine COIN_MACOSX_FRAMEWORK @@ -61,21 +46,6 @@ /* System dependent thread ID type */ #define COIN_THREADID_TYPE @COIN_THREADID_TYPE@ -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_UINT16_T @COIN_UINT16_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_UINT32_T @COIN_UINT32_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_UINT64_T @COIN_UINT64_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_UINT8_T @COIN_UINT8_T@ - -/* define this to a type of the indicated bitwidth */ -#cmakedefine COIN_UINTPTR_T @COIN_UINTPTR_T@ - /* define to "remove" conflicting IN_PATH define from */ #cmakedefine COIN_UNDEF_IN_PATH_HACK @@ -202,24 +172,6 @@ /* Define to use ilogb() */ #cmakedefine HAVE_ILOGB -/* define this if the type is available on the system */ -#cmakedefine HAVE_INT16_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_INT32_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_INT64_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_INT8_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_INTPTR_T 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_IO_H 1 @@ -292,12 +244,6 @@ /* define if you have the SpiderMonkey library */ #cmakedefine HAVE_SPIDERMONKEY_VIA_LINKTIME_LINKING -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STDLIB_H 1 @@ -328,9 +274,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TIME_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_UNISTD_H 1 @@ -346,21 +289,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_TLHELP32_H 1 -/* define this if the type is available on the system */ -#cmakedefine HAVE_UINT16_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_UINT32_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_UINT64_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_UINT8_T 1 - -/* define this if the type is available on the system */ -#cmakedefine HAVE_UINTPTR_T 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 diff --git a/src/config.h.in b/src/config.h.in index 72b2af38c0..3a88336dd2 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -12,30 +12,6 @@ /* define this to the libCoin beta version letter */ #undef COIN_BETA_VERSION -/* Build system. */ -#undef COIN_CONFIGURE_BUILD - -/* Build host system. */ -#undef COIN_CONFIGURE_HOST - -/* Build target system. */ -#undef COIN_CONFIGURE_TARGET - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT16_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT32_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT64_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT8_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INTPTR_T - /* Define when building Mac OS X framework */ #undef COIN_MACOSX_FRAMEWORK @@ -63,21 +39,6 @@ /* System dependent thread ID type */ #undef COIN_THREADID_TYPE -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT16_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT32_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT64_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT8_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINTPTR_T - /* define to "remove" conflicting IN_PATH define from */ #undef COIN_UNDEF_IN_PATH_HACK @@ -213,24 +174,6 @@ /* Define to use ilogb() */ #undef HAVE_ILOGB -/* define this if the type is available on the system */ -#undef HAVE_INT16_T - -/* define this if the type is available on the system */ -#undef HAVE_INT32_T - -/* define this if the type is available on the system */ -#undef HAVE_INT64_T - -/* define this if the type is available on the system */ -#undef HAVE_INT8_T - -/* define this if the type is available on the system */ -#undef HAVE_INTPTR_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - /* Define to 1 if you have the header file. */ #undef HAVE_IO_H @@ -303,12 +246,6 @@ /* define if you have the SpiderMonkey library */ #undef HAVE_SPIDERMONKEY_VIA_LINKTIME_LINKING -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -339,9 +276,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_UNISTD_H @@ -357,21 +291,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TLHELP32_H -/* define this if the type is available on the system */ -#undef HAVE_UINT16_T - -/* define this if the type is available on the system */ -#undef HAVE_UINT32_T - -/* define this if the type is available on the system */ -#undef HAVE_UINT64_T - -/* define this if the type is available on the system */ -#undef HAVE_UINT8_T - -/* define this if the type is available on the system */ -#undef HAVE_UINTPTR_T - /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H diff --git a/src/discard.h.in b/src/discard.h.in index fe256327a3..e6d49a0cff 100644 --- a/src/discard.h.in +++ b/src/discard.h.in @@ -12,33 +12,9 @@ /* define this to the libCoin beta version letter */ #undef COIN_BETA_VERSION -/* Build system. */ -#undef COIN_CONFIGURE_BUILD - -/* Build host system. */ -#undef COIN_CONFIGURE_HOST - -/* Build target system. */ -#undef COIN_CONFIGURE_TARGET - /* for setup.h */ #undef COIN_HAVE_JAVASCRIPT -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT16_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT32_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT64_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INT8_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_INTPTR_T - /* Define when building Mac OS X framework */ #undef COIN_MACOSX_FRAMEWORK @@ -69,21 +45,6 @@ /* for setup.h */ #undef COIN_THREADSAFE -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT16_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT32_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT64_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINT8_T - -/* define this to a type of the indicated bitwidth */ -#undef COIN_UINTPTR_T - /* define to "remove" conflicting IN_PATH define from */ #undef COIN_UNDEF_IN_PATH_HACK @@ -222,24 +183,6 @@ /* Define to use ilogb() */ #undef HAVE_ILOGB -/* define this if the type is available on the system */ -#undef HAVE_INT16_T - -/* define this if the type is available on the system */ -#undef HAVE_INT32_T - -/* define this if the type is available on the system */ -#undef HAVE_INT64_T - -/* define this if the type is available on the system */ -#undef HAVE_INT8_T - -/* define this if the type is available on the system */ -#undef HAVE_INTPTR_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - /* Define to 1 if you have the header file. */ #undef HAVE_IO_H @@ -321,12 +264,6 @@ /* define if you have the SpiderMonkey library */ #undef HAVE_SPIDERMONKEY_VIA_LINKTIME_LINKING -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -357,9 +294,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_UNISTD_H @@ -375,21 +309,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TLHELP32_H -/* define this if the type is available on the system */ -#undef HAVE_UINT16_T - -/* define this if the type is available on the system */ -#undef HAVE_UINT32_T - -/* define this if the type is available on the system */ -#undef HAVE_UINT64_T - -/* define this if the type is available on the system */ -#undef HAVE_UINT8_T - -/* define this if the type is available on the system */ -#undef HAVE_UINTPTR_T - /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H diff --git a/src/engines/so_eval.ic b/src/engines/so_eval.ic index cc0b2fff04..3d4b085c4e 100644 --- a/src/engines/so_eval.ic +++ b/src/engines/so_eval.ic @@ -123,7 +123,7 @@ #ifndef FLEXINT_H #define FLEXINT_H -/* C99 systems have . Non-C99 systems may or may not. */ +/* C99 systems have . Non-C99 systems may or may not. */ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L @@ -134,7 +134,7 @@ #define __STDC_LIMIT_MACROS 1 #endif -#include +#include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; typedef int16_t flex_int16_t; diff --git a/src/fonts/builtin2dfonts.icc b/src/fonts/builtin2dfonts.icc index 112083ab40..0807392aa0 100644 --- a/src/fonts/builtin2dfonts.icc +++ b/src/fonts/builtin2dfonts.icc @@ -1,5 +1,5 @@ -#include +#include #define COIN_FONT_13_WIDTH (7) #define COIN_FONT_17_WIDTH (10) diff --git a/src/fonts/defaultfonts.h b/src/fonts/defaultfonts.h index b934da5ff8..17319a8112 100644 --- a/src/fonts/defaultfonts.h +++ b/src/fonts/defaultfonts.h @@ -39,7 +39,6 @@ /* ********************************************************************** */ -#include #ifdef __cplusplus extern "C" { diff --git a/src/fonts/extractfont.cpp b/src/fonts/extractfont.cpp index 63b8c44ab8..12d63957b2 100644 --- a/src/fonts/extractfont.cpp +++ b/src/fonts/extractfont.cpp @@ -16,7 +16,7 @@ #include -#include +#include #ifndef FALSE #define FALSE (0) diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp index e9cf1bc8bb..8337bc9a3b 100644 --- a/src/fonts/freetype.cpp +++ b/src/fonts/freetype.cpp @@ -137,13 +137,11 @@ static int flwft_calctessellatorsteps(float complexity); #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_SYS_TYPES_H /* According to Coin user Ralf Corsepius, at least SunOS4 needs to include sys/types.h before netinet/in.h. There have also been a problem report for FreeBSD which seems to indicate that the same dependency exists on that platform as well. */ #include -#endif /* HAVE_SYS_TYPES_H */ #include #include diff --git a/src/foreignfiles/steel.cpp b/src/foreignfiles/steel.cpp index 39c8352991..8dd720a833 100644 --- a/src/foreignfiles/steel.cpp +++ b/src/foreignfiles/steel.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include #include "steel.h" @@ -185,7 +185,7 @@ #ifndef FLEXINT_H #define FLEXINT_H -/* C99 systems have . Non-C99 systems may or may not. */ +/* C99 systems have . Non-C99 systems may or may not. */ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L @@ -196,7 +196,7 @@ #define __STDC_LIMIT_MACROS 1 #endif -#include +#include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; typedef int16_t flex_int16_t; diff --git a/src/foreignfiles/steel.l b/src/foreignfiles/steel.l index 93307baec2..2623b32ab3 100644 --- a/src/foreignfiles/steel.l +++ b/src/foreignfiles/steel.l @@ -55,7 +55,7 @@ #include #include -#include +#include #include "steel.h" } diff --git a/src/glue/freetype.cpp b/src/glue/freetype.cpp index 767fd7c6a3..03f1fcf6c2 100644 --- a/src/glue/freetype.cpp +++ b/src/glue/freetype.cpp @@ -48,9 +48,7 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_SYS_TYPES_H #include -#endif /* HAVE_SYS_TYPES_H */ #ifdef HAVE_FONTCONFIG #include diff --git a/src/glue/zlib.h b/src/glue/zlib.h index 0ecce8e1f3..4707de4a96 100644 --- a/src/glue/zlib.h +++ b/src/glue/zlib.h @@ -38,6 +38,7 @@ #endif #include +#include #ifdef __cplusplus extern "C" { diff --git a/src/io/SoInput.cpp b/src/io/SoInput.cpp index c91493ca6b..3d276bd77d 100644 --- a/src/io/SoInput.cpp +++ b/src/io/SoInput.cpp @@ -101,13 +101,11 @@ #ifdef HAVE_UNISTD_H #include #endif // HAVE_UNISTD_H -#ifdef HAVE_SYS_TYPES_H /* According to Coin user Ralf Corsepius, at least SunOS4 needs to include sys/types.h before netinet/in.h. There have also been a problem report for FreeBSD which seems to indicate that the same dependency exists on that platform as well. */ #include -#endif // HAVE_SYS_TYPES_H #include #include diff --git a/src/io/gzmemio.h b/src/io/gzmemio.h index 3058e8b41c..3daa987d6a 100644 --- a/src/io/gzmemio.h +++ b/src/io/gzmemio.h @@ -37,7 +37,8 @@ #include #endif /* HAVE_CONFIG_H */ -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/misc/SoDB.cpp b/src/misc/SoDB.cpp index e7130bf417..8523878102 100644 --- a/src/misc/SoDB.cpp +++ b/src/misc/SoDB.cpp @@ -266,9 +266,8 @@ SoDB::init(void) // only think of possibilities for problems in the binary .iv import // and export code. 20010308 mortene. #if 0 - // Sanity checks: if anything here breaks, either - // include/Inventor/system/inttypes.h.in or the bitwidth define - // configure tests need fixing. Keep these tests around. + // Sanity checks: if anything here breaks, our fixed-width integer + // type assumptions need fixing. Keep these tests around. // Sanity check: if the int type is not equal to 32 bits everything // probably goes to hell. FIXME: remove this check when we are no diff --git a/src/misc/SoGenerate.h b/src/misc/SoGenerate.h index 3811a005f8..10efce938d 100644 --- a/src/misc/SoGenerate.h +++ b/src/misc/SoGenerate.h @@ -42,7 +42,6 @@ // #include -#include class SoShape; class SoAction; diff --git a/src/misc/SoPick.h b/src/misc/SoPick.h index a09eff734e..82d52c22df 100644 --- a/src/misc/SoPick.h +++ b/src/misc/SoPick.h @@ -42,7 +42,6 @@ // #include -#include class SoShape; class SoRayPickAction; diff --git a/src/misc/systemsanity.icc b/src/misc/systemsanity.icc index 3c23912aef..207f37c50a 100644 --- a/src/misc/systemsanity.icc +++ b/src/misc/systemsanity.icc @@ -22,12 +22,8 @@ SoDB_compileTimeAsserts(void) COIN_CT_ASSERT(sizeof(int16_t) == 2); COIN_CT_ASSERT(sizeof(uint32_t) == 4); COIN_CT_ASSERT(sizeof(int32_t) == 4); -#ifdef HAVE_UINT64_T COIN_CT_ASSERT(sizeof(uint64_t) == 8); -#endif // HAVE_UINT64_T -#ifdef HAVE_INT64_T COIN_CT_ASSERT(sizeof(int64_t) == 8); -#endif // HAVE_INT64_T // This now obsoleted sanity check used to be necessary because if // the unsigned long type is less than the pointer size (which is diff --git a/src/scxml/eval-minimum.cpp b/src/scxml/eval-minimum.cpp index ebea20c49a..ed85d4018c 100644 --- a/src/scxml/eval-minimum.cpp +++ b/src/scxml/eval-minimum.cpp @@ -167,7 +167,7 @@ #ifndef FLEXINT_H #define FLEXINT_H -/* C99 systems have . Non-C99 systems may or may not. */ +/* C99 systems have . Non-C99 systems may or may not. */ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L @@ -178,7 +178,7 @@ #define __STDC_LIMIT_MACROS 1 #endif -#include +#include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; typedef int16_t flex_int16_t; diff --git a/src/soscxml/eval-coin.cpp b/src/soscxml/eval-coin.cpp index fc8eeca989..e6064ba158 100644 --- a/src/soscxml/eval-coin.cpp +++ b/src/soscxml/eval-coin.cpp @@ -167,7 +167,7 @@ #ifndef FLEXINT_H #define FLEXINT_H -/* C99 systems have . Non-C99 systems may or may not. */ +/* C99 systems have . Non-C99 systems may or may not. */ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L @@ -178,7 +178,7 @@ #define __STDC_LIMIT_MACROS 1 #endif -#include +#include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; typedef int16_t flex_int16_t; diff --git a/src/unconfig.h b/src/unconfig.h index 0acdd1e006..002fcb389d 100644 --- a/src/unconfig.h +++ b/src/unconfig.h @@ -1,10 +1,9 @@ /* - * Inventor/system/inttypes.h and config.h defines some of the same - * definitions, which cause warnings with a lot of compilers. + * Public Coin headers and config.h define some of the same version + * identifiers, which can cause warnings with a lot of compilers. * - * When including config.h, we therefore undefine those definitions - * first if they are defined. The reverse is not necessary, as the - * inttypes.h file contains the necessary wrapper protection. + * When including config.h after public Coin headers, undefine those + * overlapping identifiers first. * * This header, like the config.h header, should not be installed on * the system. @@ -14,94 +13,6 @@ #error this is a private header file #endif /* !COIN_INTERNAL */ -#ifdef COIN_CONFIGURE_BUILD -#undef COIN_CONFIGURE_BUILD -#endif - -#ifdef COIN_CONFIGURE_HOST -#undef COIN_CONFIGURE_HOST -#endif - -#ifdef COIN_CONFIGURE_TARGET -#undef COIN_CONFIGURE_TARGET -#endif - -#ifdef HAVE_INTTYPES_H -#undef HAVE_INTTYPES_H -#endif - -#ifdef HAVE_STDINT_H -#undef HAVE_STDINT_H -#endif - -#ifdef HAVE_SYS_TYPES_H -#undef HAVE_SYS_TYPES_H -#endif - -#ifdef HAVE_INT8_T -#undef HAVE_INT8_T -#endif - -#ifdef HAVE_UINT8_T -#undef HAVE_UINT8_T -#endif - -#ifdef HAVE_INT16_T -#undef HAVE_INT16_T -#endif - -#ifdef HAVE_UINT16_T -#undef HAVE_UINT16_T -#endif - -#ifdef HAVE_INT32_T -#undef HAVE_INT32_T -#endif - -#ifdef HAVE_UINT32_T -#undef HAVE_UINT32_T -#endif - -#ifdef HAVE_INT64_T -#undef HAVE_INT64_T -#endif - -#ifdef HAVE_UINT64_T -#undef HAVE_UINT64_T -#endif - -#ifdef COIN_INT8_T -#undef COIN_INT8_T -#endif - -#ifdef COIN_UINT8_T -#undef COIN_UINT8_T -#endif - -#ifdef COIN_INT16_T -#undef COIN_INT16_T -#endif - -#ifdef COIN_UINT16_T -#undef COIN_UINT16_T -#endif - -#ifdef COIN_INT32_T -#undef COIN_INT32_T -#endif - -#ifdef COIN_UINT32_T -#undef COIN_UINT32_T -#endif - -#ifdef COIN_INT64_T -#undef COIN_INT64_T -#endif - -#ifdef COIN_UINT64_T -#undef COIN_UINT64_T -#endif - #ifdef COIN_MAJOR_VERSION #undef COIN_MAJOR_VERSION #endif