summaryrefslogtreecommitdiff
path: root/libopenjpeg/opj_includes.h
diff options
context:
space:
mode:
authorFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>2007-10-18 12:26:11 +0000
committerFrancois-Olivier Devaux <fodevaux@users.noreply.github.com>2007-10-18 12:26:11 +0000
commit9e114bcaa47194a9f6af8eadf6d7cb9bb1ec277f (patch)
tree8ddf614d9b481254e15a4ea9088f83d6f1534734 /libopenjpeg/opj_includes.h
parent5fdc05d18d4831ead22948950ba279fadfc6b71d (diff)
Patch from Callum Lewick. Memset patch. See ChangeLog for more details. Thanks Callum !
Diffstat (limited to 'libopenjpeg/opj_includes.h')
-rw-r--r--libopenjpeg/opj_includes.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 72152a5e..7599a71f 100644
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -54,6 +54,11 @@
==========================================================
*/
+/* Ignore GCC attributes if this is not GCC */
+#ifndef __GNUC__
+ #define __attribute__(x) /* __attribute__(x) */
+#endif
+
/*
The inline keyword is supported by C99 but not by C90.
Most compilers implement their own version of this keyword ...
@@ -72,6 +77,7 @@ Most compilers implement their own version of this keyword ...
#endif /* INLINE */
#include "j2k_lib.h"
+#include "opj_malloc.h"
#include "event.h"
#include "cio.h"