This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
amigaos4: WORD defined in exec/types.h
authorAndy Broad <andy@broad.ology.org.uk>
Wed, 19 Aug 2015 16:31:16 +0000 (12:31 -0400)
committerJarkko Hietaniemi <jhi@iki.fi>
Sat, 5 Sep 2015 15:12:43 +0000 (11:12 -0400)
perl.h

diff --git a/perl.h b/perl.h
index 7138e8a..83521d0 100644 (file)
--- 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"