Bugzilla bug 105173: test the compiler-defined __SVR4 macro instead of DBM_1_6_BRANCH
authorwtc%netscape.com
Tue, 23 Oct 2001 02:02:19 +0000
branchDBM_1_6_BRANCH
changeset 2186 572217e5bfc4b1779a69e2df99f2bbe4cee031e1
parent 2168 b47c2ebf3dd4cd35d8bfe648fa2a449cca98faa5
child 2316 3b73d07c0a55622be1f69c85431579adde84d4fe
push idunknown
push userunknown
push dateunknown
bugs105173
Bugzilla bug 105173: test the compiler-defined __SVR4 macro instead of SVR4 for Solaris. Modified Files: Tag: DBM_1_6_BRANCH include/mcom_db.h include/ncompat.h src/memmove.c
dbm/include/mcom_db.h
dbm/include/ncompat.h
dbm/src/memmove.c
--- a/dbm/include/mcom_db.h
+++ b/dbm/include/mcom_db.h
@@ -107,34 +107,34 @@
 #define BIG_ENDIAN      4321
 #define LITTLE_ENDIAN   1234            /* LSB first: i386, vax, all NT risc */
 #endif
 
 #ifdef __sun
 #define BIG_ENDIAN      4321
 #define LITTLE_ENDIAN   1234            /* LSB first: i386, vax, all NT risc */
 
-#ifndef SVR4
+#ifndef __SVR4
 /* compat.h is only in 4.1.3 machines. - dp */
 #include <compat.h>
 #endif
 
 /* XXX - dp
  * Need to find a general way of defining endian-ness in SunOS 5.3
  * SunOS 5.4 defines _BIG_ENDIAN and _LITTLE_ENDIAN
  * SunOS 5.3 does nothing like this.
  */
 
 #ifndef BYTE_ORDER
 
 #if defined(_BIG_ENDIAN)
 #define BYTE_ORDER BIG_ENDIAN
 #elif defined(_LITTLE_ENDIAN)
 #define BYTE_ORDER LITTLE_ENDIAN
-#elif !defined(SVR4)
+#elif !defined(__SVR4)
 /* 4.1.3 is always BIG_ENDIAN as it was released only on sparc platforms. */
 #define BYTE_ORDER BIG_ENDIAN
 #elif !defined(vax) && !defined(ntohl) && !defined(lint) && !defined(i386)
 /* 5.3 big endian. Copied this above line from sys/byteorder.h */
 /* Now we are in a 5.3 SunOS rather non 5.4 or above SunOS  */
 #define BYTE_ORDER BIG_ENDIAN
 #else
 #define BYTE_ORDER LITTLE_ENDIAN
--- a/dbm/include/ncompat.h
+++ b/dbm/include/ncompat.h
@@ -66,17 +66,17 @@ typedef	int		ssize_t;	/* POSIX names. */
 #if 0					/* POSIX 1003.1 signal mask type. */
 typedef unsigned int	sigset_t;
 #endif
 
 /*
  * If your system's vsprintf returns a char *, not an int,
  * change the 0 to a 1.
  */
-#if defined (__sun) && !defined(SVR4) /* SUNOS */
+#if defined (__sun) && !defined(__SVR4) /* SUNOS */
 #define	VSPRINTF_CHARSTAR
 #endif
 /*
  * If you don't have POSIX 1003.1 signals, the signal code surrounding the 
  * temporary file creation is intended to block all of the possible signals
  * long enough to create the file and unlink it.  All of this stuff is
  * intended to use old-style BSD calls to fake POSIX 1003.1 calls.
  */
--- a/dbm/src/memmove.c
+++ b/dbm/src/memmove.c
@@ -1,9 +1,9 @@
-#if defined(__sun) && !defined(__svr4__)
+#if defined(__sun) && !defined(__SVR4)
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *
  * Redistribution and use in source and binary forms, with or without