walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] remove some unused variable from opj_config and rename other one with opj_ prefix

This commit is contained in:
Mickael Savinaud 2013-03-03 18:06:27 +00:00
parent e7bc30b409
commit a8c33ae219
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/TestLargeFiles.cmake
View File

@ -7,7 +7,7 @@
# _LARGE_FILES # _LARGE_FILES
# _LARGEFILE_SOURCE # _LARGEFILE_SOURCE
# _FILE_OFFSET_BITS 64 # _FILE_OFFSET_BITS 64
# HAVE_FSEEKO # OPJ_HAVE_FSEEKO
# #
# However, it is YOUR job to make sure these defines are set in a #cmakedefine so they # However, it is YOUR job to make sure these defines are set in a #cmakedefine so they
# end up in a config.h file that is included in your source if necessary! # end up in a config.h file that is included in your source if necessary!
@ -113,10 +113,10 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
endif() endif()
if(FSEEKO_COMPILE_OK) if(FSEEKO_COMPILE_OK)
set(HAVE_FSEEKO ON CACHE INTERNAL "Result of test for fseeko/ftello") set(OPJ_HAVE_FSEEKO ON CACHE INTERNAL "Result of test for fseeko/ftello")
else() else()
message(STATUS "Checking for fseeko/ftello - not found") message(STATUS "Checking for fseeko/ftello - not found")
set(HAVE_FSEEKO OFF CACHE INTERNAL "Result of test for fseeko/ftello") set(OPJ_HAVE_FSEEKO OFF CACHE INTERNAL "Result of test for fseeko/ftello")
endif() endif()
if(FILE64_OK AND FSEEKO_COMPILE_OK) if(FILE64_OK AND FSEEKO_COMPILE_OK)

19
src/lib/openjp2/opj_config.h.cmake.in
View File

@ -3,19 +3,20 @@
#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@" #define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ /* Not used by openjp2*/
#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ /*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@*/
#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@ /*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ /*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
#cmakedefine HAVE_STRING_H @HAVE_STRING_H@ /*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/
#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ /*#cmakedefine HAVE_STRING_H @HAVE_STRING_H@*/
#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ /*#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@*/
#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ /*#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ */
/*#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@*/
#cmakedefine _LARGEFILE_SOURCE #cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGE_FILES #cmakedefine _LARGE_FILES
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ #cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
#cmakedefine HAVE_FSEEKO @HAVE_FSEEKO@ #cmakedefine OPJ_HAVE_FSEEKO @OPJ_HAVE_FSEEKO@
/* Byte order. */ /* Byte order. */