Skip to content

Commit a26ac42

Browse files
committed
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.
1 parent d2a522e commit a26ac42

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

src/include/port/freebsd.h

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,47 @@
11
#if defined(__i386__)
2-
typedef unsigned char slock_t;
3-
2+
#define NEED_I386_TAS_ASM
43
#define HAS_TEST_AND_SET
4+
typedef unsigned char slock_t;
55
#endif
66

77
#if defined(__sparc__)
88
#define NEED_SPARC_TAS_ASM
99
#define HAS_TEST_AND_SET
10-
#endif
11-
12-
#if defined(__alpha__)
13-
typedef long int slock_t;
14-
15-
#define HAS_TEST_AND_SET
10+
typedef unsigned char slock_t;
1611
#endif
1712

1813
#if defined(__vax__)
19-
typedef unsigned char slock_t;
20-
2114
#define NEED_VAX_TAS_ASM
2215
#define HAS_TEST_AND_SET
16+
typedef unsigned char slock_t;
2317
#endif
2418

2519
#if defined(__ns32k__)
2620
#define NEED_NS32K_TAS_ASM
2721
#define HAS_TEST_AND_SET
22+
typedef unsigned char slock_t;
2823
#endif
2924

3025
#if defined(__m68k__)
3126
#define HAS_TEST_AND_SET
27+
typedef unsigned char slock_t;
28+
#endif
29+
30+
#if defined(__arm__)
31+
#define HAS_TEST_AND_SET
32+
typedef unsigned char slock_t;
3233
#endif
3334

3435
#if defined(__mips__)
3536
/* # undef HAS_TEST_AND_SET */
37+
#endif
38+
39+
#if defined(__alpha__)
40+
#define HAS_TEST_AND_SET
41+
typedef unsigned long slock_t;
42+
#endif
3643

44+
#if defined(__powerpc__)
45+
#define HAS_TEST_AND_SET
46+
typedef unsigned int slock_t;
3747
#endif

src/include/port/netbsd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,4 @@ typedef unsigned long slock_t;
4444
#if defined(__powerpc__)
4545
#define HAS_TEST_AND_SET
4646
typedef unsigned int slock_t;
47-
4847
#endif

src/include/port/openbsd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,4 @@ typedef unsigned long slock_t;
4444
#if defined(__powerpc__)
4545
#define HAS_TEST_AND_SET
4646
typedef unsigned int slock_t;
47-
4847
#endif

0 commit comments

Comments
 (0)