Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/ntp/include Fix incorrect merge.
details: https://anonhg.NetBSD.org/src/rev/9de9d720f831
branches: trunk
changeset: 933722:9de9d720f831
user: christos <christos%NetBSD.org@localhost>
date: Fri May 29 10:50:36 2020 +0000
description:
Fix incorrect merge.
diffstat:
external/bsd/ntp/include/config.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diffs (15 lines):
diff -r 64a1da7ca05b -r 9de9d720f831 external/bsd/ntp/include/config.h
--- a/external/bsd/ntp/include/config.h Fri May 29 10:47:37 2020 +0000
+++ b/external/bsd/ntp/include/config.h Fri May 29 10:50:36 2020 +0000
@@ -1560,7 +1560,11 @@
#define SIZEOF_LONG_LONG 8
/* The size of `pthread_t', as computed by sizeof. */
+#ifdef _LP64
#define SIZEOF_PTHREAD_T 8
+#else
+#define SIZEOF_PTHREAD_T 4
+#endif
/* The size of `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
Home |
Main Index |
Thread Index |
Old Index