[svn:parrot] r40155 - in trunk: config/gen/platform/win32 include/parrot

whiteknight at svn.parrot.org whiteknight at svn.parrot.org
Sun Jul 19 15:43:38 UTC 2009


Author: whiteknight
Date: Sun Jul 19 15:43:37 2009
New Revision: 40155
URL: https://trac.parrot.org/parrot/changeset/40155

Log:
[Win64] Two fixes for Win64 that help with build and execution.

Modified:
   trunk/config/gen/platform/win32/time.c
   trunk/include/parrot/compiler.h

Modified: trunk/config/gen/platform/win32/time.c
==============================================================================
--- trunk/config/gen/platform/win32/time.c	Sun Jul 19 07:47:50 2009	(r40154)
+++ trunk/config/gen/platform/win32/time.c	Sun Jul 19 15:43:37 2009	(r40155)
@@ -37,10 +37,10 @@
 Parrot_intval_time(void)
 {
 #if defined(_MSC_VER) && _MSC_VER >= 1400
-#  if INTVAL_SIZE <= 4
-    return _time32(NULL);
+#  ifdef _WIN64
+    return (INTVAL)_time64(NULL);
 #  else
-    return _time64(NULL);
+    return _time32(NULL);
 #  endif
 #else
     return time(NULL);

Modified: trunk/include/parrot/compiler.h
==============================================================================
--- trunk/include/parrot/compiler.h	Sun Jul 19 07:47:50 2009	(r40154)
+++ trunk/include/parrot/compiler.h	Sun Jul 19 15:43:37 2009	(r40155)
@@ -99,6 +99,17 @@
  */
 #define UNUSED(a) /*@-noeffect*/if (0) (void)(a)/*@=noeffect*/;
 
+/* 64-bit CL has some problems, so this section here is going to try to fix them */
+#ifdef PARROT_HAS_MSVC_SAL
+#  ifdef _WIN64
+	/* CL64 can't seem to find sal.h, so take that out of the equation */
+#    undef PARROT_HAS_MSVC_SAL
+	/* CL64 complains about not finding _iob, so this might fix it */
+
+
+#  endif
+#endif
+
 #ifdef PARROT_HAS_MSVC_SAL
 #  include <sal.h>
 #  define PARROT_CAN_RETURN_NULL      /*@null@*/ __maybenull


More information about the parrot-commits mailing list