fix win64

include/SWI-Prolog.h

@@ -50,6 +50,12 @@ extern "C" {
 #include <time.h>
 #endif
 
+#ifndef __WINDOWS__
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define __WINDOWS__ 1
+#endif
+#endif
+
 #ifndef X_API
 #if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(PL_KERNEL)
 #define X_API __declspec(dllexport)
@@ -58,12 +64,6 @@ extern "C" {
 #endif
 #endif
 
-#ifndef __WINDOWS__
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#define __WINDOWS__ 1
-#endif
-#endif
-
 
 		 /*******************************
 		 *	       EXPORT		*
@@ -154,15 +154,8 @@ typedef uintptr_t	PL_fid_t;	/* opaque foreign context handle */
 typedef int  (*PL_dispatch_hook_t)(int fd);
 typedef void *pl_function_t;
 
-
-#define O_STRING 1
-
-#define COMMON(X) X
-
-
 #define fid_t PL_fid_t			/* avoid AIX name-clash */
 
-
 typedef struct _PL_extension
 { const char 		*predicate_name;	/* Name of the predicate */
   short		arity;			/* Arity of the predicate */