summaryrefslogtreecommitdiff
path: root/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-09-30 11:12:05 -0700
committerBo Xu <bo_xu@foxitsoftware.com>2014-09-30 11:12:05 -0700
commitd53e6fdb0a86ca1ddb12876a60f7f2d7508b5349 (patch)
tree1d1eebf565936adff5d2d5c68741774e8d86f0eb /core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h
parent1b24b697659b9b933f336238665c835497464a0b (diff)
downloadpdfium-d53e6fdb0a86ca1ddb12876a60f7f2d7508b5349.tar.xz
Update openjpeg
BUG=407964, 414182, 413447 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/589243004
Diffstat (limited to 'core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h')
-rw-r--r--core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h26
1 files changed, 4 insertions, 22 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h
index b0d3a351bb..5a6c33da56 100644
--- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h
+++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h
@@ -1,39 +1,21 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
/* create opj_config_private.h for CMake */
-/* #undef OPJ_HAVE_INTTYPES_H */
-
-#ifndef _WIN32
-#ifndef OPJ_HAVE_INTTYPES_H
-#define OPJ_HAVE_INTTYPES_H
-#endif
-#endif
+#define OPJ_HAVE_INTTYPES_H 1
#define OPJ_PACKAGE_VERSION "2.1.0"
/* Not used by openjp2*/
/*#define HAVE_MEMORY_H 1*/
/*#define HAVE_STDLIB_H 1*/
-/* #undef HAVE_STRINGS_H */
+/*#define HAVE_STRINGS_H 1*/
/*#define HAVE_STRING_H 1*/
/*#define HAVE_SYS_STAT_H 1*/
/*#define HAVE_SYS_TYPES_H 1 */
-/* #undef HAVE_UNISTD_H */
+/*#define HAVE_UNISTD_H 1*/
/* #undef _LARGEFILE_SOURCE */
/* #undef _LARGE_FILES */
/* #undef _FILE_OFFSET_BITS */
-/* #undef OPJ_HAVE_FSEEKO */
-
-#ifndef _WIN32
-#ifndef OPJ_HAVE_FSEEKO
-#define OPJ_HAVE_FSEEKO
-#endif
-#endif
+#define OPJ_HAVE_FSEEKO ON
/* Byte order. */
/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or