diff --git a/compat.h b/compat.h
index 7ea9c63f..245697ab 100644
--- a/compat.h
+++ b/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__ */
diff --git a/configure.ac b/configure.ac
index edfa4e0c..d6fd2150 100644
--- a/configure.ac
+++ b/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)