summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Broad <andy@broad.ology.org.uk>2015-08-19 12:31:16 -0400
committerJarkko Hietaniemi <jhi@iki.fi>2015-09-05 11:12:43 -0400
commit153a1061c434ce6bd260de8414949e2f86119d3f (patch)
tree59f708fa051767dba54c7e00c90ead4c55adf4e6
parent78d6b36aee6bcb92a17a1f961e0aff8ddd62eef9 (diff)
downloadperl-153a1061c434ce6bd260de8414949e2f86119d3f.tar.gz
amigaos4: WORD defined in exec/types.h
-rw-r--r--perl.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl.h b/perl.h
index 7138e8ab29..83521d0502 100644
--- a/perl.h
+++ b/perl.h
@@ -3702,11 +3702,10 @@ typedef struct crypt_data { /* straight from /usr/include/crypt.h */
# define USE_HASH_SEED
#endif
-/* Win32 defines a type 'WORD' in windef.h. This conflicts with the enumerator
- * 'WORD' defined in perly.h. The yytokentype enum is only a debugging aid, so
- * it's not really needed.
- */
-#if defined(WIN32)
+/* Win32 defines a type 'WORD' in windef.h, and AmigaOS in exec/types.h.
+ * This conflicts with the enumerator 'WORD' defined in perly.h.
+ * The yytokentype enum is only a debugging aid, so it's not really needed. */
+#if defined(WIN32) || defined(__amigaos4__)
# define YYTOKENTYPE
#endif
#include "perly.h"