diff options
author | nelson%bolyard.com <devnull@localhost> | 2009-02-26 23:22:10 +0000 |
---|---|---|
committer | nelson%bolyard.com <devnull@localhost> | 2009-02-26 23:22:10 +0000 |
commit | 4aa120c36ead4207eb35f55deb7c94e588d7bf67 (patch) | |
tree | 1d0fe8665cc1ea2dd5ffeed8425312072843b5ec /dbm | |
parent | 467ecfc8baffe39d729e82c384612e213c28bd81 (diff) | |
download | nss-hg-4aa120c36ead4207eb35f55deb7c94e588d7bf67.tar.gz |
Bug 433791 - Win16 support should be deleted from NSS, r=wtc
Patch by Serge Gautherie <sgautherie.bz@free.fr>
Diffstat (limited to 'dbm')
-rw-r--r-- | dbm/include/watcomfx.h | 26 | ||||
-rw-r--r-- | dbm/src/db.c | 2 | ||||
-rw-r--r-- | dbm/src/h_bigkey.c | 2 | ||||
-rw-r--r-- | dbm/src/h_func.c | 2 | ||||
-rw-r--r-- | dbm/src/h_log2.c | 2 | ||||
-rw-r--r-- | dbm/src/h_page.c | 2 | ||||
-rw-r--r-- | dbm/src/hash.c | 2 | ||||
-rw-r--r-- | dbm/src/hash_buf.c | 2 | ||||
-rw-r--r-- | dbm/src/memmove.c | 2 | ||||
-rw-r--r-- | dbm/src/mktemp.c | 2 | ||||
-rw-r--r-- | dbm/src/snprintf.c | 1 | ||||
-rw-r--r-- | dbm/src/strerror.c | 2 |
12 files changed, 0 insertions, 47 deletions
diff --git a/dbm/include/watcomfx.h b/dbm/include/watcomfx.h index 3020e9de9..e69de29bb 100644 --- a/dbm/include/watcomfx.h +++ b/dbm/include/watcomfx.h @@ -1,26 +0,0 @@ -#if defined(__WATCOMC__) || defined(__WATCOM_CPLUSPLUS__) -#ifndef __WATCOM_FIX_H__ -#define __WATCOM_FIX_H__ 1 -/* - * WATCOM's C compiler doesn't default to "__cdecl" conventions for external - * symbols and functions. Rather than adding an explicit __cdecl modifier to - * every external symbol and function declaration and definition, we use the - * following pragma to (attempt to) change WATCOM c's default to __cdecl. - * These pragmas were taken from pages 180-181, 266 & 269 of the - * Watcom C/C++ version 11 User's Guide, 3rd edition. - */ -#if defined(XP_WIN16) || defined(WIN16) -#pragma aux default "_*" \ - parm caller [] \ - value struct float struct routine [ax] \ - modify [ax bx cx dx es] -#else -#pragma aux default "_*" \ - parm caller [] \ - value struct float struct routine [eax] \ - modify [eax ecx edx] -#endif -#pragma aux default far - -#endif /* once */ -#endif /* WATCOM compiler */ diff --git a/dbm/src/db.c b/dbm/src/db.c index 468bd4b62..851295233 100644 --- a/dbm/src/db.c +++ b/dbm/src/db.c @@ -33,8 +33,6 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #ifndef __DBINTERFACE_PRIVATE #define __DBINTERFACE_PRIVATE #endif diff --git a/dbm/src/h_bigkey.c b/dbm/src/h_bigkey.c index fb9680d56..c174e32a7 100644 --- a/dbm/src/h_bigkey.c +++ b/dbm/src/h_bigkey.c @@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - /* * PACKAGE: hash * DESCRIPTION: diff --git a/dbm/src/h_func.c b/dbm/src/h_func.c index 6022e6531..8c86be64a 100644 --- a/dbm/src/h_func.c +++ b/dbm/src/h_func.c @@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #ifndef macintosh #include <sys/types.h> #endif diff --git a/dbm/src/h_log2.c b/dbm/src/h_log2.c index 66b975e89..9c8ea06c8 100644 --- a/dbm/src/h_log2.c +++ b/dbm/src/h_log2.c @@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hash_log2.c 8.2 (Berkeley) 5/31/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #include <stdio.h> #ifndef macintosh #include <sys/types.h> diff --git a/dbm/src/h_page.c b/dbm/src/h_page.c index f26cc92e2..3b95554db 100644 --- a/dbm/src/h_page.c +++ b/dbm/src/h_page.c @@ -43,8 +43,6 @@ extern long new_lseek(int fd, long pos, int start); static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - /* * PACKAGE: hashing * diff --git a/dbm/src/hash.c b/dbm/src/hash.c index 4e157e828..e98aa4301 100644 --- a/dbm/src/hash.c +++ b/dbm/src/hash.c @@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) #include <sys/param.h> #endif diff --git a/dbm/src/hash_buf.c b/dbm/src/hash_buf.c index 303f35c2c..727164c65 100644 --- a/dbm/src/hash_buf.c +++ b/dbm/src/hash_buf.c @@ -36,8 +36,6 @@ static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - /* * PACKAGE: hash * diff --git a/dbm/src/memmove.c b/dbm/src/memmove.c index 4c97dd9fd..935ab4638 100644 --- a/dbm/src/memmove.c +++ b/dbm/src/memmove.c @@ -37,8 +37,6 @@ static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #ifdef HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #else diff --git a/dbm/src/mktemp.c b/dbm/src/mktemp.c index 592711ad2..c70e2f57c 100644 --- a/dbm/src/mktemp.c +++ b/dbm/src/mktemp.c @@ -33,8 +33,6 @@ static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #ifdef macintosh #include <unix.h> #else diff --git a/dbm/src/snprintf.c b/dbm/src/snprintf.c index 3a1adfc8a..96696d8e8 100644 --- a/dbm/src/snprintf.c +++ b/dbm/src/snprintf.c @@ -1,6 +1,5 @@ #ifndef HAVE_SNPRINTF -#include "watcomfx.h" #include <sys/types.h> #include <stddef.h> #include <stdio.h> diff --git a/dbm/src/strerror.c b/dbm/src/strerror.c index a8232d9a3..83d16e7c2 100644 --- a/dbm/src/strerror.c +++ b/dbm/src/strerror.c @@ -33,8 +33,6 @@ static char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include "watcomfx.h" - #include <string.h> #ifdef _DLL |