Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -650,13 +638,9 @@ else()
set(COIN_DEBUG_SYSTEM_LIBRARY_NAME "$<TARGET_FILE_NAME:Coin>")
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)
Expand Down
1 change: 0 additions & 1 deletion include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
16 changes: 5 additions & 11 deletions include/Inventor/C/basic.h.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Inventor/system/inttypes.h>
#include <stddef.h>
#include <stdint.h>

/* Internal note for Coin developers: in other sourcefiles in Coin, we
* depend on math.h being included through SbBasic.h. It is done this
Expand Down
16 changes: 5 additions & 11 deletions include/Inventor/C/basic.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Inventor/system/inttypes.h>
#include <stddef.h>
#include <stdint.h>

/* Internal note for Coin developers: in other sourcefiles in Coin, we
* depend on math.h being included through SbBasic.h. It is done this
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbColor.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/

#include <Inventor/system/inttypes.h>
#include <Inventor/SbVec3f.h>

class COIN_DLL_API SbColor : public SbVec3f {
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbColor4f.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/

#include <Inventor/system/inttypes.h>
#include <Inventor/SbVec4f.h>
#include <Inventor/SbColor.h>

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbString.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <cstdarg>
#include <cstdio>

#include <Inventor/system/inttypes.h>
#include <Inventor/C/base/string.h>

#ifdef COIN_INTERNAL
Expand Down
2 changes: 1 addition & 1 deletion include/Inventor/SbTime.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <cstdio>

#include <Inventor/system/inttypes.h>
#include <time.h>
#include <Inventor/SbBasic.h>
#include <Inventor/SbString.h>

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbTypeInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@

#ifndef DOXYGEN_SKIP_THIS

#include <Inventor/system/inttypes.h>
#include <Inventor/C/basic.h>

// *************************************************************************
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec2b.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec2i32.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <cstdio>

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec2s.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <cstdio>

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#include <Inventor/SbString.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec2ub.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec2ui32.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec2us.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec3b.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec3i32.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec3ub.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec3ui32.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec3us.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

#include <cstdio>
#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#include <Inventor/SbByteBuffer.h>
#include <Inventor/SbString.h>

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec4b.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec4i32.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec4s.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec4ub.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec4ui32.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SbVec4us.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#ifndef NDEBUG
#include <Inventor/errors/SoDebugError.h>
#endif // !NDEBUG
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SoInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/

#include <Inventor/system/inttypes.h>
#include <Inventor/SbBasic.h>
#include <Inventor/lists/SbList.h>
#include <cstdio> // FILE
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SoOutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/

#include <Inventor/system/inttypes.h>
#include <Inventor/SbBasic.h>
#include <Inventor/SbString.h>
#include <cstdio>
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/SoPrimitiveVertex.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <Inventor/SbVec2f.h>
#include <Inventor/SbVec3f.h>
#include <Inventor/SbVec4f.h>
#include <Inventor/system/inttypes.h>

class SoDetail;

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/actions/SoGLRenderAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <Inventor/actions/SoSubAction.h>
#include <Inventor/SbBasic.h>
#include <Inventor/SbViewportRegion.h>
#include <Inventor/system/inttypes.h>
#include <Inventor/lists/SoPathList.h>
#include <Inventor/lists/SbList.h>

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/bundles/SoMaterialBundle.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

#include <Inventor/bundles/SoBundle.h>
#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>

class SoGLLazyElement;

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/bundles/SoTextureCoordinateBundle.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

#include <Inventor/bundles/SoBundle.h>
#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>
#include <Inventor/elements/SoGLMultiTextureCoordinateElement.h>

#include <Inventor/SbVec4f.h>
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/caches/SoConvexDataCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/caches/SoCache.h>
#include <Inventor/system/inttypes.h>

class SbVec3f;
class SoCoordinateElement;
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/caches/SoNormalCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

#include <Inventor/SbVec3f.h>
#include <Inventor/caches/SoCache.h>
#include <Inventor/system/inttypes.h>

class SoNormalGenerator;
class SoNormalCacheP;
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/elements/SoInt32Element.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/elements/SoSubElement.h>
#include <Inventor/system/inttypes.h>

class COIN_DLL_API SoInt32Element : public SoElement {
typedef SoElement inherited;
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/elements/SoOverrideElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/elements/SoSubElement.h>
#include <Inventor/system/inttypes.h>

class SoType; // lame doxygen "fix"

Expand Down
1 change: 0 additions & 1 deletion include/Inventor/elements/SoReplacedElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
\**************************************************************************/

#include <Inventor/elements/SoSubElement.h>
#include <Inventor/system/inttypes.h>

class COIN_DLL_API SoReplacedElement : public SoElement {
typedef SoElement inherited;
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/misc/SoByteStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/

#include <Inventor/system/inttypes.h>
#include <Inventor/SbBasic.h>

class SoNode;
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/misc/SoNormalGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include <Inventor/SbVec3f.h>
#include <Inventor/SbBSPTree.h>
#include <Inventor/lists/SbList.h>
#include <Inventor/system/inttypes.h>

class COIN_DLL_API SoNormalGenerator {
public:
Expand Down
1 change: 0 additions & 1 deletion include/Inventor/sensors/SoDelayQueueSensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

#include <Inventor/sensors/SoSensor.h>
#include <Inventor/SbBasic.h>
#include <Inventor/system/inttypes.h>

class COIN_DLL_API SoDelayQueueSensor : public SoSensor {
typedef SoSensor inherited;
Expand Down
Loading
Loading