summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2003-01-01 20:35:39 +0000
committerTom Lane2003-01-01 20:35:39 +0000
commita26ac42b7663387b69e3f53bddc7d9f8543d8317 (patch)
treeffea3692da0f145cfff2f751f12ded4da2dea357
parentd2a522e483008778bb886fd58ac4bf5b9b7c37c7 (diff)
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.
-rw-r--r--src/include/port/freebsd.h30
-rw-r--r--src/include/port/netbsd.h1
-rw-r--r--src/include/port/openbsd.h1
3 files changed, 20 insertions, 12 deletions
diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
index a884b9da0d9..aba5c72fe62 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 7729fa5b9bb..aba5c72fe62 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 7729fa5b9bb..aba5c72fe62 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