summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2013-03-13 10:18:04 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2013-03-13 10:18:04 +0000
commit92b1e038c16be50d9b67d2bb72bb473ab8d2d753 (patch)
treeaf735c6cb88dee5f7c3f58ae3708dfefe5cb1d76 /src/lib
parenta8c33ae2197f934ce6be79887f467f09add714a8 (diff)
[trunk] correct missing variable in openjpeg config file
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/opj_config.h.cmake.in4
-rw-r--r--src/lib/openjp2/opj_inttypes.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/openjp2/opj_config.h.cmake.in b/src/lib/openjp2/opj_config.h.cmake.in
index aed6dbc5..d922d116 100644
--- a/src/lib/openjp2/opj_config.h.cmake.in
+++ b/src/lib/openjp2/opj_config.h.cmake.in
@@ -1,10 +1,10 @@
/* create config.h for CMake */
-#cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@
+#cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@
+#cmakedefine OPJ_HAVE_INTTYPES_H @OPJ_HAVE_INTTYPES_H@
#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
/* Not used by openjp2*/
-/*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@*/
/*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
/*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
/*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/
diff --git a/src/lib/openjp2/opj_inttypes.h b/src/lib/openjp2/opj_inttypes.h
index d6a29263..f94f648b 100644
--- a/src/lib/openjp2/opj_inttypes.h
+++ b/src/lib/openjp2/opj_inttypes.h
@@ -27,7 +27,7 @@
#define OPJ_INTTYPES_H
#include "opj_config.h"
-#ifdef HAVE_INTTYPES_H
+#ifdef OPJ_HAVE_INTTYPES_H
#include <inttypes.h>
#else
#if defined(_WIN32)