Module Name: src
Committed By: christos
Date: Fri May 29 10:50:36 UTC 2020
Modified Files:
src/external/bsd/ntp/include: config.h
Log Message:
Fix incorrect merge.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/ntp/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/include/config.h
diff -u src/external/bsd/ntp/include/config.h:1.24 src/external/bsd/ntp/include/config.h:1.25
--- src/external/bsd/ntp/include/config.h:1.24 Mon May 25 16:47:37 2020
+++ src/external/bsd/ntp/include/config.h Fri May 29 06:50:36 2020
@@ -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
