Changeset 319eab in git

Timestamp:

Oct 24, 2013, 3:09:05 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

64b9bf992f264ded468801493ed3f0c0b0d80082

Parents:

4f27bf50e1488440ad6012cf7e75f9c2d1e00e76

Message:

chg: singuname stuff -> standard defines

Files:

• Singular/cntrlc.cc (modified) (2 diffs)
• libpolys/polys/mod_raw.cc (modified) (1 diff)

Singular/cntrlc.cc

@@ -172 +172 @@
 
 /*---------------------------------------------------------------------*/
-#if defined(ix86_Linux)
+#if defined(__linux__) && defined(__i386)
   #if !defined(HAVE_SIGCONTEXT) && !defined(HAVE_ASM_SIGCONTEXT_H)
 // we need the following structure sigcontext_struct.
@@ -207 +207 @@
 #endif
 
-#if defined(x86_64_Linux)
+#if defined(__linux__) && defined(__amd64)
 #define HAVE_SIGSTRUCT
 #endif

libpolys/polys/mod_raw.cc

@@ -130 +130 @@
  *****************************************************************************/
 // relying on gcc to define __ELF__, check with cpp -dM /dev/null
-// Mac OsX is an ELF system, but does not define __ELF__
-// Solaris is an ELF system, but does not define __ELF__
 #if defined(__ELF__)
 #define HAVE_ELF_SYSTEM
 #endif
 
-#if defined(ppcMac_darwin)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(ix86Mac_darwin)
-#define HAVE_ELF_SYSTEM
-#endif
-
-#if defined(x86_64Mac_darwin)
-#define HAVE_ELF_SYSTEM
-#endif
-
+// Mac OsX is an ELF system, but does not define __ELF__
 #if (defined(__APPLE__) && defined(__MACH__)) && (!defined(HAVE_ELF_SYSTEM))
 #define HAVE_ELF_SYSTEM
 #endif
 
-#if defined(SunOS_5)
+// Solaris is an ELF system, but does not define __ELF__
+#if defined(__sun) && defined(__SVR4)
 #define HAVE_ELF_SYSTEM
 #endif