Merge pull request #1 from robertdavidgraham/master

test
robertdavidgraham · Jul 10, 2015 · 8304363 · 8304363
2 parents a60cc70 + cec300a
commit 8304363
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/pixie-threads.c b/src/pixie-threads.c
@@ -180,7 +180,7 @@ pixie_begin_thread(
 #if defined(WIN32)
     UNUSEDPARM(flags);
     return _beginthread(worker_thread, 0, worker_data);
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__kFreeBSD__) || defined(__OpenBSD__)
 
     typedef void *(*PTHREADFUNC)(void*);
     pthread_t thread_id;

diff --git a/src/pixie-threads.h b/src/pixie-threads.h
@@ -40,7 +40,7 @@ void pixie_locked_subtract_u32(unsigned *lhs, unsigned rhs);
 #define pixie_locked_CAS32(dst, src, expected) __sync_bool_compare_and_swap((volatile int*)(dst),(int)expected,(int)src);
 #define pixie_locked_CAS64(dst, src, expected) __sync_bool_compare_and_swap((volatile long long int*)(dst),(long long int)expected,(long long int)src);
 
-#if defined(__arm__)
+#if !defined(__x86_64__) && !defined(__i386__)
 #define rte_wmb() __sync_synchronize()
 #define rte_rmb() __sync_synchronize()
 #define rte_pause()

diff --git a/src/string_s.h b/src/string_s.h
@@ -77,7 +77,7 @@ const char *strerror_x(int x);
  typedef int errno_t;
 errno_t fopen_s(FILE **fp, const char *filename, const char *mode);
 
-#elif defined(__GNUC__) && (__GNUC__ == 4)
+#elif defined(__GNUC__) && (__GNUC__ >= 4)
 #include <inttypes.h>
 /* GCC 4 */
 # define sprintf_s      snprintf