diff options
| author | pinkerton%netscape.com <devnull@localhost> | 2001-02-13 21:47:29 +0000 |
|---|---|---|
| committer | pinkerton%netscape.com <devnull@localhost> | 2001-02-13 21:47:29 +0000 |
| commit | 7328dbf7502b29a650e9cf5bf0a11f184170119f (patch) | |
| tree | b53599fe5e986f054869161de51c62123bbea776 /dbm | |
| parent | aef26e055107639b81424da05a8b3034af1e8903 (diff) | |
| parent | 479ddde5650af027225fa6ef2dc934975619d2b8 (diff) | |
| download | nss-hg-7328dbf7502b29a650e9cf5bf0a11f184170119f.tar.gz | |
carbon changes. r=pink/sdagley/beard. a=sfraser.
Diffstat (limited to 'dbm')
| -rw-r--r-- | dbm/include/cdefs.h | 2 | ||||
| -rw-r--r-- | dbm/src/db.c | 2 | ||||
| -rw-r--r-- | dbm/src/h_page.c | 6 | ||||
| -rw-r--r-- | dbm/src/hash.c | 9 | ||||
| -rw-r--r-- | dbm/src/hsearch.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/dbm/include/cdefs.h b/dbm/include/cdefs.h index 7b5c46f63..a933c5882 100644 --- a/dbm/include/cdefs.h +++ b/dbm/include/cdefs.h @@ -101,7 +101,7 @@ #if defined(__cplusplus) #define __inline inline /* convert to C++ keyword */ #else -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__MWERKS__) #define __inline /* delete GCC keyword */ #endif /* !__GNUC__ */ #endif /* !__cplusplus */ diff --git a/dbm/src/db.c b/dbm/src/db.c index 2c6edec2a..e4b1fff8f 100644 --- a/dbm/src/db.c +++ b/dbm/src/db.c @@ -47,9 +47,7 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; #endif #include <errno.h> -#ifndef macintosh #include <fcntl.h> -#endif #include <stddef.h> #include <stdio.h> diff --git a/dbm/src/h_page.c b/dbm/src/h_page.c index aa82b4ad4..f81298e67 100644 --- a/dbm/src/h_page.c +++ b/dbm/src/h_page.c @@ -66,10 +66,12 @@ static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94"; #include <sys/types.h> #endif +#if defined(macintosh) +#include <unistd.h> +#endif + #include <errno.h> -#ifndef macintosh #include <fcntl.h> -#endif #include <signal.h> #include <stdio.h> #include <stdlib.h> diff --git a/dbm/src/hash.c b/dbm/src/hash.c index cef9e08da..5aa91424b 100644 --- a/dbm/src/hash.c +++ b/dbm/src/hash.c @@ -51,12 +51,13 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #include <sys/stat.h> #endif -#include <errno.h> -#ifdef macintosh +#if defined(macintosh) #include <unix.h> -#else -#include <fcntl.h> +#include <unistd.h> #endif + +#include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/dbm/src/hsearch.c b/dbm/src/hsearch.c index 4ae4cabe4..fb8a58bad 100644 --- a/dbm/src/hsearch.c +++ b/dbm/src/hsearch.c @@ -42,9 +42,9 @@ static char sccsid[] = "@(#)hsearch.c 8.4 (Berkeley) 7/21/94"; #ifndef macintosh #include <sys/types.h> +#endif #include <fcntl.h> -#endif #include <string.h> #include "mcom_db.h" |