SF.net SVN: matplotlib:[6791] trunk/matplotlib

[<as...@us...>]

Revision: 6791
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6791&view=rev
Author:   astraw
Date:     2009-01-16 18:16:40 +0000 (Fri, 16 Jan 2009)

Log Message:
-----------
Bugfix of C typedef of MPL_Int64 failing on WinXP64

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/src/MPL_isnan.h

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-01-16 17:06:38 UTC (rev 6790)
+++ trunk/matplotlib/CHANGELOG	2009-01-16 18:16:40 UTC (rev 6791)
@@ -1,3 +1,7 @@
+2009-11-16 Bugfix of C typedef of MPL_Int64 that was failing on
+           Windows XP 64 bit, as reported by George Goussard on numpy
+           mailing list. - ADS
+
 2009-11-16 Added helper function LinearSegmentedColormap.from_list to
            facilitate building simple custom colomaps.  See
            examples/pylab_examples/custom_cmap_fromlist.py - JDH

Modified: trunk/matplotlib/src/MPL_isnan.h
===================================================================
--- trunk/matplotlib/src/MPL_isnan.h	2009-01-16 17:06:38 UTC (rev 6790)
+++ trunk/matplotlib/src/MPL_isnan.h	2009-01-16 18:16:40 UTC (rev 6791)
@@ -12,19 +12,6 @@
 #include <stdint.h>
 #endif
 
-#if defined(SIZEOF_VOID_P)
-#if SIZEOF_VOID_P == 8
-#define MPL_LP64 1
-#else
-#define MPL_LP64 0
-#endif
-#else
-#define MPL_LP64 0
-#endif
-
-#if MPL_LP64
-typedef long int                 MPL_Int64;
-#else                  /* 32-bit platforms */
 #if defined(_MSC_VER)
 typedef __int64                  MPL_Int64;
 #else
@@ -34,7 +21,6 @@
 typedef long long                MPL_Int64;
 #endif
 #endif
-#endif
 
 #if !defined(MPL_U64)
 #define MPL_U64(u) (* (MPL_Int64 *) &(u) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.