summaryrefslogtreecommitdiff
path: root/dbm
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2001-10-23 22:05:06 +0000
committerwtc%netscape.com <devnull@localhost>2001-10-23 22:05:06 +0000
commitbb4fb956595935a29e6d7b544f1998c546649c72 (patch)
tree6a857c3edd7f16d57fb21c35eb4d51788e870050 /dbm
parent47387fc20378578a7968bb5a1e0e74e87ade8cf3 (diff)
downloadnss-hg-bb4fb956595935a29e6d7b544f1998c546649c72.tar.gz
Bugzilla bug 105173: test the compiler-defined __SVR4 macro instead of
SVR4 for Solaris. Modified Files: include/mcom_db.h include/ncompat.h src/memmove.c
Diffstat (limited to 'dbm')
-rw-r--r--dbm/include/mcom_db.h5
-rw-r--r--dbm/include/ncompat.h2
-rw-r--r--dbm/src/memmove.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/dbm/include/mcom_db.h b/dbm/include/mcom_db.h
index 973e8e320..9ec583711 100644
--- a/dbm/include/mcom_db.h
+++ b/dbm/include/mcom_db.h
@@ -112,7 +112,8 @@
#define BIG_ENDIAN 4321
#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */
-#ifdef HAVE_COMPAT_H
+#ifndef __SVR4
+/* compat.h is only in 4.1.3 machines. - dp */
#include <compat.h>
#endif
@@ -128,7 +129,7 @@
#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)
diff --git a/dbm/include/ncompat.h b/dbm/include/ncompat.h
index 640da046d..c95b327fe 100644
--- a/dbm/include/ncompat.h
+++ b/dbm/include/ncompat.h
@@ -71,7 +71,7 @@ typedef unsigned int sigset_t;
* 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
/*
diff --git a/dbm/src/memmove.c b/dbm/src/memmove.c
index c4f9ff02e..70eb1e5d2 100644
--- a/dbm/src/memmove.c
+++ b/dbm/src/memmove.c
@@ -1,4 +1,4 @@
-#if defined(__sun) && !defined(__svr4__)
+#if defined(__sun) && !defined(__SVR4)
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.