From 1aa34cc52cb0b371e8663b77100bb7a26627c41c Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Wed, 1 Apr 2009 01:23:18 +0000
Subject: [PATCH] merge from gcc

---
 libdecnumber/ChangeLog    | 4 ++++
 libdecnumber/decContext.h | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 864694a9da..4d0e3d9d0a 100644
--- 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 70effd8008..02061614bf 100644
--- 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 		      */