marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Add a typedef for "boolean". 

Fix up an conflict that this type has with jpeglib.h.
oldstable
Robert Shearman 2006-07-06 12:54:58 +01:00 committed by Alexandre Julliard
parent dd677948b4
commit c71af73324
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/oleaut32/olepicture.c
View File

@ -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"

6
include/rpcndr.h
View File

@ -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