From a26ac42b7663387b69e3f53bddc7d9f8543d8317 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 1 Jan 2003 20:35:39 +0000 Subject: [PATCH] Awhile back I wrote that freebsd.h was probably broken in the places where it diverged from netbsd.h and openbsd.h. This has now been confirmed. Accordingly, make all three exactly alike. --- src/include/port/freebsd.h | 30 ++++++++++++++++++++---------- src/include/port/netbsd.h | 1 - src/include/port/openbsd.h | 1 - 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h index a884b9da0d..aba5c72fe6 100644 --- a/src/include/port/freebsd.h +++ b/src/include/port/freebsd.h @@ -1,37 +1,47 @@ #if defined(__i386__) -typedef unsigned char slock_t; - +#define NEED_I386_TAS_ASM #define HAS_TEST_AND_SET +typedef unsigned char slock_t; #endif #if defined(__sparc__) #define NEED_SPARC_TAS_ASM #define HAS_TEST_AND_SET -#endif - -#if defined(__alpha__) -typedef long int slock_t; - -#define HAS_TEST_AND_SET +typedef unsigned char slock_t; #endif #if defined(__vax__) -typedef unsigned char slock_t; - #define NEED_VAX_TAS_ASM #define HAS_TEST_AND_SET +typedef unsigned char slock_t; #endif #if defined(__ns32k__) #define NEED_NS32K_TAS_ASM #define HAS_TEST_AND_SET +typedef unsigned char slock_t; #endif #if defined(__m68k__) #define HAS_TEST_AND_SET +typedef unsigned char slock_t; +#endif + +#if defined(__arm__) +#define HAS_TEST_AND_SET +typedef unsigned char slock_t; #endif #if defined(__mips__) /* # undef HAS_TEST_AND_SET */ +#endif + +#if defined(__alpha__) +#define HAS_TEST_AND_SET +typedef unsigned long slock_t; +#endif +#if defined(__powerpc__) +#define HAS_TEST_AND_SET +typedef unsigned int slock_t; #endif diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index 7729fa5b9b..aba5c72fe6 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -44,5 +44,4 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; - #endif diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h index 7729fa5b9b..aba5c72fe6 100644 --- a/src/include/port/openbsd.h +++ b/src/include/port/openbsd.h @@ -44,5 +44,4 @@ typedef unsigned long slock_t; #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; - #endif -- 2.40.0