From 4c513140bf9f98d135b011ee24f6e6cf8f0c9773 Mon Sep 17 00:00:00 2001
From: "wtc%google.com" <wtc%google.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Nov 2008 14:57:20 +0000
Subject: [PATCH] Bug 454097: removed support for the OS/2 VisualAge compiler
 (XP_OS2_VACPP). The patch is contributed by Walter Meinl <wuno@lsvw.de>. 
 r=wtc. Modified Files: 	include/mcom_db.h src/h_bigkey.c src/h_page.c
 src/hash.c 	src/hash_buf.c src/mktemp.c src/snprintf.c

git-svn-id: svn://10.0.0.236/trunk@255247 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/dbm/include/mcom_db.h | 10 +---------
 mozilla/dbm/src/h_bigkey.c    |  2 +-
 mozilla/dbm/src/h_page.c      |  2 +-
 mozilla/dbm/src/hash.c        |  6 +++---
 mozilla/dbm/src/hash_buf.c    |  2 +-
 mozilla/dbm/src/mktemp.c      |  6 +-----
 mozilla/dbm/src/snprintf.c    |  7 +++----
 7 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/mozilla/dbm/include/mcom_db.h b/mozilla/dbm/include/mcom_db.h
index d265f432256..45cff2dd783 100644
--- a/mozilla/dbm/include/mcom_db.h
+++ b/mozilla/dbm/include/mcom_db.h
@@ -156,7 +156,7 @@
 #define LITTLE_ENDIAN   1234
 #endif
 
-#if defined(_WINDOWS) || defined(XP_OS2_VACPP)
+#ifdef _WINDOWS
 #ifdef BYTE_ORDER
 #undef BYTE_ORDER
 #endif
@@ -188,14 +188,6 @@
 #define MAXPATHLEN 	1024               
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <os2.h>
-#define	MAXPATHLEN	CCHMAXPATH
-#define	EPERM		EINVAL
-#define	ENOTDIR		EBADPOS
-#define	S_ISDIR(s)	((s) & S_IFDIR)
-#endif
-
 #define	EFTYPE		EINVAL		/* POSIX 1003.1 format errno. */
 
 #ifndef	STDERR_FILENO
diff --git a/mozilla/dbm/src/h_bigkey.c b/mozilla/dbm/src/h_bigkey.c
index 5cf7f15db15..fb9680d56c0 100644
--- a/mozilla/dbm/src/h_bigkey.c
+++ b/mozilla/dbm/src/h_bigkey.c
@@ -56,7 +56,7 @@ static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
  *	collect_data
  */
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/param.h>
 #endif
 
diff --git a/mozilla/dbm/src/h_page.c b/mozilla/dbm/src/h_page.c
index 1f06a0a6ad1..f26cc92e249 100644
--- a/mozilla/dbm/src/h_page.c
+++ b/mozilla/dbm/src/h_page.c
@@ -78,7 +78,7 @@ static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <unistd.h>
 #endif
 
diff --git a/mozilla/dbm/src/hash.c b/mozilla/dbm/src/hash.c
index d4c0e073912..4e157e8287a 100644
--- a/mozilla/dbm/src/hash.c
+++ b/mozilla/dbm/src/hash.c
@@ -38,12 +38,12 @@ static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 
 #include "watcomfx.h"
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/param.h>
 #endif
 
 #if !defined(macintosh)
-#ifdef XP_OS2_EMX
+#ifdef XP_OS2
 #include <sys/types.h>
 #endif
 #include <sys/stat.h>
@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <unistd.h>
 #endif
 #if defined(_WIN32) || defined(_WINDOWS) 
diff --git a/mozilla/dbm/src/hash_buf.c b/mozilla/dbm/src/hash_buf.c
index b9d1987fa1a..303f35c2cee 100644
--- a/mozilla/dbm/src/hash_buf.c
+++ b/mozilla/dbm/src/hash_buf.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
  * Internal
  *	newbuf
  */
-#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
+#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/param.h>
 #endif
 
diff --git a/mozilla/dbm/src/mktemp.c b/mozilla/dbm/src/mktemp.c
index ecd9369788d..592711ad2fd 100644
--- a/mozilla/dbm/src/mktemp.c
+++ b/mozilla/dbm/src/mktemp.c
@@ -47,14 +47,10 @@ static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #include <ctype.h>
 #include "mcom_db.h"
 
-#if !defined(_WINDOWS) && !defined(XP_OS2_VACPP)
+#ifndef _WINDOWS
 #include <unistd.h>
 #endif
 
-#ifdef XP_OS2_VACPP
-#include <process.h>
-#endif
-
 #ifdef _WINDOWS
 #include <process.h>
 #include "winfile.h"
diff --git a/mozilla/dbm/src/snprintf.c b/mozilla/dbm/src/snprintf.c
index 49877857236..3a1adfc8ab0 100644
--- a/mozilla/dbm/src/snprintf.c
+++ b/mozilla/dbm/src/snprintf.c
@@ -15,15 +15,14 @@
 
 #include <ncompat.h>
 
-/* The OS/2 VAC compiler doesn't appear to define __STDC__ and won't let us define it either */
-#if defined(__STDC__) || defined(XP_OS2_VACPP)
+#ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
 int
-#if defined(__STDC__) || defined(XP_OS2_VACPP)
+#ifdef __STDC__
 snprintf(char *str, size_t n, const char *fmt, ...)
 #else
 snprintf(str, n, fmt, va_alist)
@@ -39,7 +38,7 @@ snprintf(str, n, fmt, va_alist)
 #else
 	int rval;
 #endif
-#if defined(__STDC__) || defined(XP_OS2_VACPP)
+#ifdef __STDC__
 	va_start(ap, fmt);
 #else
 	va_start(ap);