Browse Source

Merge pull request #17 from ycros/osx

Fix suseconds_t for OSX.
Con Kolivas 14 years ago
parent
commit
5affc3b5ab
2 changed files with 13 additions and 11 deletions
  1. 4 4
      compat.h
  2. 9 7
      configure.ac

+ 4 - 4
compat.h

@@ -1,10 +1,6 @@
 #ifndef __COMPAT_H__
 #define __COMPAT_H__
 
-#ifndef __SUSECONDS_T_TYPE
-typedef long suseconds_t;
-#endif
-
 #ifdef WIN32
 
 #include <windows.h>
@@ -28,6 +24,10 @@ typedef unsigned long int ulong;
 typedef unsigned short int ushort;
 typedef unsigned int uint;
 
+#ifndef __SUSECONDS_T_TYPE
+typedef long suseconds_t;
+#endif
+
 #endif /* WIN32 */
 
 #endif /* __COMPAT_H__ */

+ 9 - 7
configure.ac

@@ -29,22 +29,24 @@ have_win32=false
 PTHREAD_FLAGS="-pthread"
 OPENCL_FLAGS="-lOpenCL"
 
+case $target in
+  x86_64-*)
+    have_x86_64=true
+    ;;
+  *)
+    have_x86_64=false
+    ;;
+esac
+
 case $target in
   *-*-mingw*)
     have_x86_64=false
     have_win32=true
     PTHREAD_FLAGS=""
     ;;
-  x86_64-*)
-    have_x86_64=true
-    ;;
   *-*-darwin*)
-    have_x86_64=false
     OPENCL_FLAGS="-framework OpenCL"
 	;;
-  *)
-    have_x86_64=false
-    ;;
 esac
 
 # Check for OpenCL (the long way needed on mingw32 due to calling conventions)