Skip to content

Commit 66f4ae9

Browse files
authored
cleanup: Get rid of some compiler symbols no longer needed (#4606)
The newer versions of the compilers we now use no longer need this. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 3a9cf59 commit 66f4ae9

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

src/cmake/compiler.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,6 @@ if (CMAKE_COMPILER_IS_GNUCC AND NOT (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_I
180180
endif ()
181181
endif ()
182182

183-
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
184-
# Options common to gcc and clang
185-
186-
# Ensure this macro is set for stdint.h
187-
add_compile_definitions (__STDC_LIMIT_MACROS)
188-
add_compile_definitions (__STDC_CONSTANT_MACROS)
189-
endif ()
190-
191183
if (INTELCLANG_VERSION_STRING VERSION_GREATER_EQUAL 2022.1.0)
192184
# New versions of icx warn about changing certain floating point options
193185
add_compile_options ("-Wno-overriding-t-option")

src/include/OpenImageIO/image_view.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,6 @@
88
#include <stdexcept>
99
#include <vector>
1010

11-
// We're including stdint.h to get int64_t and INT64_MIN. But on some
12-
// platforms, stdint.h only defines them if __STDC_LIMIT_MACROS is defined,
13-
// so we do so. But, oops, if user code included stdint.h before this file,
14-
// and without defining the macro, it may have had ints one and only include
15-
// and not seen the definitions we need, so at least try to make a helpful
16-
// compile-time error in that case.
17-
// And very old MSVC 9 versions don't even have stdint.h.
18-
#if defined(_MSC_VER) && _MSC_VER < 1600
19-
typedef __int64 int64_t;
20-
#else
21-
# ifndef __STDC_LIMIT_MACROS
22-
# define __STDC_LIMIT_MACROS /* needed for some defs in stdint.h */
23-
# endif
24-
# include <cstdint>
25-
# if !defined(INT64_MIN)
26-
# error You must define __STDC_LIMIT_MACROS prior to including stdint.h
27-
# endif
28-
#endif
29-
3011
#include <OpenImageIO/oiioversion.h>
3112
#include <OpenImageIO/strided_ptr.h>
3213

0 commit comments

Comments
 (0)