[Python-checkins] r77645 - python/branches/py3k-cdecimal/Modules/cdecimal/mptypes.h

[stefan.krah]

Author: stefan.krah
Date: Thu Jan 21 16:41:10 2010
New Revision: 77645

Log:
Fix OS specific conversion specifiers.

Modified:
   python/branches/py3k-cdecimal/Modules/cdecimal/mptypes.h

Modified: python/branches/py3k-cdecimal/Modules/cdecimal/mptypes.h
==============================================================================
--- python/branches/py3k-cdecimal/Modules/cdecimal/mptypes.h	(original)
+++ python/branches/py3k-cdecimal/Modules/cdecimal/mptypes.h	Thu Jan 21 16:41:10 2010
@@ -10,10 +10,10 @@
 
 #if defined(CONFIG_64)
   #if defined(_MSC_VER)
-    #define PRI_size_t "llu"
+    #define PRI_mpd_size_t "llu"
     #define PRI_mpd_ssize_t "lld"
   #else
-    #define PRI_size_t "lu"
+    #define PRI_mpd_size_t "lu"
     #define PRI_mpd_ssize_t "ld"
   #endif
   #define PRI_time_t "ld"
@@ -21,21 +21,31 @@
   #define ONE_UM 1ULL
 #elif defined(CONFIG_32)
   #if defined (__OpenBSD__)
-    #define PRI_size_t "lu"
-    #define PRI_mpd_ssize_t "ld"
+    #define PRI_mpd_size_t "u"
+    #define PRI_mpd_ssize_t "d"
     #define PRI_time_t "d"
+  #elif defined(__FreeBSD__)
+    #define PRI_mpd_size_t "u"
+    #define PRI_mpd_ssize_t "d"
+    #if defined(__x86_64__)
+      #define PRI_time_t "ld"
+    #else
+      #define PRI_time_t "d"
+    #endif
   #else
-    #define PRI_size_t "u"
+    #define PRI_mpd_size_t "u"
     #define PRI_mpd_ssize_t "d"
     #define PRI_time_t "ld"
   #endif
-  #define CONV_mpd_ssize_t "l"
+  #if MPD_SSIZE_MAX != INT_MAX
+    #error "define CONV_mpd_ssize_t"
+  #endif
+  #define CONV_mpd_ssize_t "i"
   #define ONE_UM 1UL
 #else
   #error "define CONFIG_64 or CONFIG_32"
 #endif
 
-
 #endif