Skip to content

W
wine-cw
Commit c71af733 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

oleaut32: Add a typedef for "boolean".

Fix up an conflict that this type has with jpeglib.h.
parent dd677948
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/oleaut32/olepicture.c
View file @ c71af733
...@@ -83,7 +83,9 @@ ...@@ -83,7 +83,9 @@
#define UINT8 JPEG_UINT8 #define UINT8 JPEG_UINT8
#define UINT16 JPEG_UINT16 #define UINT16 JPEG_UINT16
#undef FAR #undef FAR
#define boolean jpeg_boolean
# include <jpeglib.h> # include <jpeglib.h>
#undef jpeg_boolean
#undef UINT16 #undef UINT16
#ifndef SONAME_LIBJPEG #ifndef SONAME_LIBJPEG
#define SONAME_LIBJPEG "libjpeg.so" #define SONAME_LIBJPEG "libjpeg.so"
......
include/rpcndr.h
View file @ c71af733
...@@ -92,9 +92,7 @@ extern "C" { ...@@ -92,9 +92,7 @@ extern "C" {
typedef unsigned char byte; typedef unsigned char byte;
#define hyper __int64 #define hyper __int64
#define MIDL_uhyper unsigned __int64 #define MIDL_uhyper unsigned __int64
/* 'boolean' tend to conflict, let's call it _wine_boolean */ typedef unsigned char boolean;
typedef unsigned char _wine_boolean;
/* typedef _wine_boolean boolean; */
#define __RPC_CALLEE WINAPI #define __RPC_CALLEE WINAPI
#define RPC_VAR_ENTRY __cdecl #define RPC_VAR_ENTRY __cdecl
...@@ -121,7 +119,7 @@ typedef struct ...@@ -121,7 +119,7 @@ typedef struct
typedef void (__RPC_USER *NDR_RUNDOWN)(void *context); typedef void (__RPC_USER *NDR_RUNDOWN)(void *context);
typedef void (__RPC_USER *NDR_NOTIFY_ROUTINE)(void); 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 DECLSPEC_UUID(x)
#define MIDL_INTERFACE(x) struct #define MIDL_INTERFACE(x) struct
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment