[PATCH 08/12] Use __CYGWIN__ instead of __CYGWIN32__ to detect Cygwin

Ken Brown <[email protected]>
Newsgroups gmane.lisp.clisp.devel
Message-ID <[email protected]> 
# HG changeset patch
# User Ken Brown <[email protected]>
# Date 1425573330 18000
#      Thu Mar 05 11:35:30 2015 -0500
# Node ID 2130cb689a5d63ae7e97facbc2336c6517f64247
# Parent  ce68b45a1070376b75abb61d8be7ee908e949805
Use __CYGWIN__ instead of __CYGWIN32__ to detect Cygwin

__CYGWIN32__ is deprecated and, more importantly, is not defined on
64-bit Cygwin.

diff -r ce68b45a1070 -r 2130cb689a5d src/ari80386.d
--- a/src/ari80386.d    Thu Mar 05 11:29:12 2015 -0500
+++ b/src/ari80386.d    Thu Mar 05 11:35:30 2015 -0500
@@ -52,7 +52,7 @@
     #endif
     # Alignment. Note that some assemblers need ".align 3,0x90" whereas other
     # assemblers don't like this syntax. So we put in the "nop"s by hand.
-    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN32__) || defined(__MINGW32__))
+    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN__) || defined(__MINGW32__))
       # BSD syntax assembler
       #define ALIGN  .align 3
     #else
diff -r ce68b45a1070 -r 2130cb689a5d src/ari80386.msvc.c
--- a/src/ari80386.msvc.c       Thu Mar 05 11:29:12 2015 -0500
+++ b/src/ari80386.msvc.c       Thu Mar 05 11:35:30 2015 -0500
@@ -52,7 +52,7 @@
     #endif


-    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN32__) || defined(__MINGW32__))
+    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN__) || defined(__MINGW32__))

       #define ALIGN  .align 3
     #else
diff -r ce68b45a1070 -r 2130cb689a5d src/asmi386.h
--- a/src/asmi386.h     Thu Mar 05 11:29:12 2015 -0500
+++ b/src/asmi386.h     Thu Mar 05 11:35:30 2015 -0500
@@ -174,10 +174,10 @@
 #define REPZ repz ;
 #endif
 #define REP rep ;
-#if defined(BSD_SYNTAX) && !(defined(__CYGWIN32__) || defined(__MINGW32__))
+#if defined(BSD_SYNTAX) && !(defined(__CYGWIN__) || defined(__MINGW32__))
 #define ALIGN(log) .align log,0x90
 #endif
-#if defined(ELF_SYNTAX) || defined(__CYGWIN32__) || defined(__MINGW32__)
+#if defined(ELF_SYNTAX) || defined(__CYGWIN__) || defined(__MINGW32__)
 #define ALIGN(log) .align 1<<log
 #endif
 #endif
diff -r ce68b45a1070 -r 2130cb689a5d src/asmi386.hh
--- a/src/asmi386.hh    Thu Mar 05 11:29:12 2015 -0500
+++ b/src/asmi386.hh    Thu Mar 05 11:35:30 2015 -0500
@@ -174,10 +174,10 @@
 #define REPZ repz ;
 #endif
 #define REP rep ;
-#if defined(BSD_SYNTAX) && !(defined(__CYGWIN32__) || defined(__MINGW32__))
+#if defined(BSD_SYNTAX) && !(defined(__CYGWIN__) || defined(__MINGW32__))
 #define ALIGN(log) .align log,0x90
 #endif
-#if defined(ELF_SYNTAX) || defined(__CYGWIN32__) || defined(__MINGW32__)
+#if defined(ELF_SYNTAX) || defined(__CYGWIN__) || defined(__MINGW32__)
 #define ALIGN(log) .align 1<<log
 #endif
 #endif
diff -r ce68b45a1070 -r 2130cb689a5d src/lispbibl.d
--- a/src/lispbibl.d    Thu Mar 05 11:29:12 2015 -0500
+++ b/src/lispbibl.d    Thu Mar 05 11:35:30 2015 -0500
@@ -84,11 +84,11 @@
  IBM-PC/386   any                NetBSD 0.9 (UNIX BSD 4.3)     GNU           unix, __NetBSD__, i386, __GNUC__
  IBM-PC/386   any                FreeBSD 4.0 (UNIX BSD 4.4)    GNU           unix, __FreeBSD__, i386, __GNUC__
  IBM-PC/386   any                EMX 0.9c (UNIXlike on OS/2)   GNU           [unix,] i386, __GNUC__, __EMX__
- IBM-PC/386   any                Cygwin32 on WinNT/Win95       GNU           _WIN32, __WINNT__, __CYGWIN32__, __POSIX__, _X86_, i386, __GNUC__
+ IBM-PC/386   any                Cygwin32 on WinNT/Win95       GNU           _WIN32, __WINNT__, __CYGWIN__, __POSIX__, _X86_, i386, __GNUC__
  IBM-PC/386   any                Mingw32 on WinNT/Win95        GNU           _WIN32, __WINNT__, __MINGW32__, _X86_, i386, __GNUC__
  IBM-PC/386   any                WinNT/Win95                   MSVC          _WIN32, _M_IX86, _MSC_VER
  IBM-PC/386   any                WinNT/Win95                   Borland 5.0   __WIN32__, _M_IX86, __TURBOC__, __BORLANDC__
- IBM-PC/386   any                WinNT/Win95 and Cygwin32      GNU           _WIN32, __WINNT__, __CYGWIN32__, __POSIX__, __i386__, _X86_, __GNUC__
+ IBM-PC/386   any                WinNT/Win95 and Cygwin32      GNU           _WIN32, __WINNT__, __CYGWIN__, __POSIX__, __i386__, _X86_, __GNUC__
  IBM-PC/586   any                BeOS 5                        GNU           __BEOS__, __INTEL__, __i386__, _X86_, __GNUC__
  IBM-PC/586   any                HP NUE/ski, Linux             GNU           unix, linux, __ia64[__], __GNUC__, __LP64__
  RM400        Siemens-Nixdorf    SINIX-N 5.42                  c89           unix, mips, MIPSEB, host_mips, sinix, SNI, _XPG_IV
@@ -121,7 +121,7 @@
   #define PC386 /* IBMPC-compatible with 80386/80486-processor */
 #endif
 #ifdef GENERIC_UNIX
-  #if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
+  #if (defined(unix) && (defined(linux) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
     #define PC386
   #endif
   #if (defined(sun) && defined(unix) && defined(sparc))
@@ -295,7 +295,7 @@
   #ifdef AMIX
     #define UNIX_AMIX  /* Amiga UNIX */
   #endif
-  #ifdef __CYGWIN32__
+  #ifdef __CYGWIN__
     #define UNIX_CYGWIN32  /* Cygwin32 (UNIXlike on WinNT/Win95) */
   #endif
   #ifdef __BEOS__
diff -r ce68b45a1070 -r 2130cb689a5d src/sp80386.d
--- a/src/sp80386.d     Thu Mar 05 11:29:12 2015 -0500
+++ b/src/sp80386.d     Thu Mar 05 11:35:30 2015 -0500
@@ -12,7 +12,7 @@
     #endif
     # Alignment. Note that some assemblers need ".align 3,0x90" whereas other
     # assemblers don't like this syntax. So we put in the "nop"s by hand.
-    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN32__) || defined(__MINGW32__))
+    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN__) || defined(__MINGW32__))
       # BSD syntax assembler
       #define ALIGN  .align 3
     #else
diff -r ce68b45a1070 -r 2130cb689a5d src/sp80386.msvc.c
--- a/src/sp80386.msvc.c        Thu Mar 05 11:29:12 2015 -0500
+++ b/src/sp80386.msvc.c        Thu Mar 05 11:35:30 2015 -0500
@@ -12,7 +12,7 @@
     #endif


-    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN32__) || defined(__MINGW32__))
+    #if defined(ASM_UNDERSCORE) && !(defined(__CYGWIN__) || defined(__MINGW32__))

       #define ALIGN  .align 3
     #else


------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
clisp-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/clisp-devel
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.