From 97c61aeba50ee50321561e403d072595cf9d6b7d Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 13 Feb 2003 15:37:07 +0000
Subject: [PATCH] * include/cygwin/types.h: Use correct ifdef guard for u_
 definitions.

---
 winsup/cygwin/ChangeLog              |  4 ++++
 winsup/cygwin/include/cygwin/types.h | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b23fa14a3..a7a54ae18 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-13  Christopher Faylor  <cgf@redhat.com>
+
+	* include/cygwin/types.h: Use correct ifdef guard for u_ definitions.
+
 2003-02-13  Christopher Faylor  <cgf@redhat.com>
 
 	* environ.cc (environ_init): Use strechr.
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index c4ba3a656..793157e61 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -145,20 +145,20 @@ typedef __uint32_t uint32_t;
 typedef __uint64_t uint64_t;
 #endif
 
-#ifndef __uint8_t_defined
-#define __uint8_t_defined
+#ifndef __u_int8_t_defined
+#define __u_int8_t_defined
 typedef unsigned char u_int8_t;
 #endif
-#ifndef __uint16_t_defined
-#define __uint16_t_defined
+#ifndef __u_int16_t_defined
+#define __u_int16_t_defined
 typedef __uint16_t u_int16_t;
 #endif
-#ifndef __uint32_t_defined
-#define __uint32_t_defined
+#ifndef __u_int32_t_defined
+#define __u_int32_t_defined
 typedef __uint32_t u_int32_t;
 #endif
-#ifndef __uint64_t_defined
-#define __uint64_t_defined
+#ifndef __u_int64_t_defined
+#define __u_int64_t_defined
 typedef __uint64_t u_int64_t;
 #endif