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.

diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
index a884b9da0d923bba2b2c04645bb584937f031216..aba5c72fe629d010587ff5cb25d2bebdb16e269c 100644 (file)
--- 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 7729fa5b9bb306e61d68bdf39bf25abd816f9620..aba5c72fe629d010587ff5cb25d2bebdb16e269c 100644 (file)
--- 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 7729fa5b9bb306e61d68bdf39bf25abd816f9620..aba5c72fe629d010587ff5cb25d2bebdb16e269c 100644 (file)
--- 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