merge from gcc

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 864694a9daab2cd8807be48a275234a9d6247fff..4d0e3d9d0ac70bffbac6a50c7504a191edb1a51d 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-01  Ben Elliston  <bje@au.ibm.com>
+
+        * decContext.h: Include gstdint.h instead of <stdint.h>.
+
 2009-03-30  Ben Elliston  <bje@au.ibm.com>
 
        * decNumber.c, decNumber.h, decNumberLocal.h, decDouble.c,

diff --git a/libdecnumber/decContext.h b/libdecnumber/decContext.h
index 70effd8008357b0db4a5c224d7d6bd8c36d7433f..02061614bf8f845b8023de03980d0be708280402 100644 (file)
--- a/libdecnumber/decContext.h
+++ b/libdecnumber/decContext.h
@@ -56,9 +56,7 @@
   #define DECCFULLNAME "Decimal Context Descriptor"   /* Verbose name */
   #define DECCAUTHOR   "Mike Cowlishaw"              /* Who to blame */
 
-  #if !defined(int32_t)
-    #include <stdint.h>           /* C99 standard integers           */
-  #endif
+  #include "gstdint.h"            /* C99 standard integers           */
   #include <stdio.h>              /* for printf, etc.                */
   #include <signal.h>             /* for traps                       */