Ticket #40102: BOOL.patch

File BOOL.patch, 4.0 KB (added by ryandesign (Ryan Carsten Schmidt), 10 years ago)

updated BOOL.patch (same as wine-devel's)

  • dlls/gdi32/freetype.c

    old new  
    4040#include <assert.h>
    4141
    4242#ifdef HAVE_CARBON_CARBON_H
     43#define BOOL __carbon_BOOL
    4344#define LoadResource __carbon_LoadResource
    4445#define CompareString __carbon_CompareString
    4546#define GetCurrentThread __carbon_GetCurrentThread
    … …  
    5758#define ResizePalette __carbon_ResizePalette
    5859#define SetRectRgn __carbon_SetRectRgn
    5960#include <Carbon/Carbon.h>
     61#undef BOOL
    6062#undef LoadResource
    6163#undef CompareString
    6264#undef GetCurrentThread

  • dlls/windowscodecs/icnsformat.c

    old new  
    2222#include <stdarg.h>
    2323
    2424#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
     25#define BOOL BOOL_Mac
    2526#define GetCurrentProcess GetCurrentProcess_Mac
    2627#define GetCurrentThread GetCurrentThread_Mac
    2728#define LoadResource LoadResource_Mac
    … …  
    4950#define ShowCursor ShowCursor_Mac
    5051#define UnionRect UnionRect_Mac
    5152#include <ApplicationServices/ApplicationServices.h>
     53#undef BOOL
    5254#undef GetCurrentProcess
    5355#undef GetCurrentThread
    5456#undef LoadResource

  • dlls/wineqtdecoder/qtdatahandler.c

    old new  
    2323#define ULONG CoreFoundation_ULONG
    2424#define HRESULT CoreFoundation_HRESULT
    2525
     26#define BOOL __carbon_BOOL
    2627#define LoadResource __carbon_LoadResource
    2728#define CompareString __carbon_CompareString
    2829#define GetCurrentThread __carbon_GetCurrentThread
    … …  
    6263
    6364#include <QuickTime/QuickTimeComponents.h>
    6465
     66#undef BOOL
    6567#undef LoadResource
    6668#undef CompareString
    6769#undef GetCurrentThread

  • dlls/wineqtdecoder/qtsplitter.c

    old new  
    2323#define ULONG CoreFoundation_ULONG
    2424#define HRESULT CoreFoundation_HRESULT
    2525
     26#define BOOL __carbon_BOOL
    2627#define LoadResource __carbon_LoadResource
    2728#define CompareString __carbon_CompareString
    2829#define GetCurrentThread __carbon_GetCurrentThread
    … …  
    6364#include <QuickTime/Movies.h>
    6465#include <QuickTime/QuickTimeComponents.h>
    6566
     67#undef BOOL
    6668#undef LoadResource
    6769#undef CompareString
    6870#undef GetCurrentThread

  • dlls/wineqtdecoder/qtutils.c

    old new  
    2323#define ULONG CoreFoundation_ULONG
    2424#define HRESULT CoreFoundation_HRESULT
    2525
     26#define BOOL __carbon_BOOL
    2627#define LoadResource __carbon_LoadResource
    2728#define CompareString __carbon_CompareString
    2829#define GetCurrentThread __carbon_GetCurrentThread
    … …  
    6263
    6364#include <CoreVideo/CVPixelBuffer.h>
    6465
     66#undef BOOL
    6567#undef LoadResource
    6668#undef CompareString
    6769#undef GetCurrentThread

  • dlls/wineqtdecoder/qtvdecoder.c

    old new  
    2323#define ULONG CoreFoundation_ULONG
    2424#define HRESULT CoreFoundation_HRESULT
    2525
     26#define BOOL __carbon_BOOL
    2627#define LoadResource __carbon_LoadResource
    2728#define CompareString __carbon_CompareString
    2829#define GetCurrentThread __carbon_GetCurrentThread
    … …  
    6364#include <QuickTime/ImageCompression.h>
    6465#include <CoreVideo/CVPixelBuffer.h>
    6566
     67#undef BOOL
    6668#undef LoadResource
    6769#undef CompareString
    6870#undef GetCurrentThread

  • dlls/dinput/joystick_osx.c

    old new  
    2929#define LONG SInt32
    3030#define LPLONG SInt32*
    3131#define E_PENDING __carbon_E_PENDING
     32#define BOOL __carbon_BOOL
    3233#define ULONG __carbon_ULONG
    3334#define E_INVALIDARG __carbon_E_INVALIDARG
    3435#define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY
    … …  
    5253#include <IOKit/IOKitLib.h>
    5354#include <IOKit/hid/IOHIDLib.h>
    5455#include <ForceFeedback/ForceFeedback.h>
     56#undef BOOL
    5557#undef ULONG
    5658#undef E_INVALIDARG
    5759#undef E_OUTOFMEMORY