From c71af7332401745eeb3f2367ceca1ff964e21781 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Thu, 6 Jul 2006 12:54:58 +0100
Subject: [PATCH] oleaut32: Add a typedef for "boolean".

Fix up an conflict that this type has with jpeglib.h.
---
 dlls/oleaut32/olepicture.c | 2 ++
 include/rpcndr.h           | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 89b7edb9880..9130027efbf 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -83,7 +83,9 @@
 #define UINT8 JPEG_UINT8
 #define UINT16 JPEG_UINT16
 #undef FAR
+#define boolean jpeg_boolean
 # include <jpeglib.h>
+#undef jpeg_boolean
 #undef UINT16
 #ifndef SONAME_LIBJPEG
 #define SONAME_LIBJPEG "libjpeg.so"
diff --git a/include/rpcndr.h b/include/rpcndr.h
index 42e5b1c5d30..780fa29c8c3 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -92,9 +92,7 @@ extern "C" {
 typedef unsigned char byte;
 #define hyper __int64
 #define MIDL_uhyper unsigned __int64
-/* 'boolean' tend to conflict, let's call it _wine_boolean */
-typedef unsigned char _wine_boolean;
-/* typedef _wine_boolean boolean; */
+typedef unsigned char boolean;
 
 #define __RPC_CALLEE WINAPI
 #define RPC_VAR_ENTRY __cdecl
@@ -121,7 +119,7 @@ typedef struct
 
 typedef void (__RPC_USER *NDR_RUNDOWN)(void *context);
 typedef void (__RPC_USER *NDR_NOTIFY_ROUTINE)(void);
-typedef void (__RPC_USER *NDR_NOTIFY2_ROUTINE)(_wine_boolean flag);
+typedef void (__RPC_USER *NDR_NOTIFY2_ROUTINE)(boolean flag);
 
 #define DECLSPEC_UUID(x)
 #define MIDL_INTERFACE(x)   struct