From 196a987032de1eb4ea0e696e1ec4631b71efd828 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 23 Oct 2001 22:05:06 +0000
Subject: [PATCH] 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

git-svn-id: svn://10.0.0.236/trunk@106063 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/dbm/include/mcom_db.h | 5 +++--
 mozilla/dbm/include/ncompat.h | 2 +-
 mozilla/dbm/src/memmove.c     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mozilla/dbm/include/mcom_db.h b/mozilla/dbm/include/mcom_db.h
index 973e8e32041..9ec583711e4 100644
--- a/mozilla/dbm/include/mcom_db.h
+++ b/mozilla/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/mozilla/dbm/include/ncompat.h b/mozilla/dbm/include/ncompat.h
index 640da046d10..c95b327feb3 100644
--- a/mozilla/dbm/include/ncompat.h
+++ b/mozilla/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/mozilla/dbm/src/memmove.c b/mozilla/dbm/src/memmove.c
index c4f9ff02efc..70eb1e5d245 100644
--- a/mozilla/dbm/src/memmove.c
+++ b/mozilla/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.