ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed a few more #ifdef __WINE__.

This commit is contained in:
Alexandre Julliard 2003-01-04 00:19:17 +00:00
parent 1f722892d8
commit b4a4c05aed
11 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/comctl32/imagelist.c
View File

@ -253,9 +253,8 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
* Success: index of the new image * Success: index of the new image
* Failure: -1 * Failure: -1
*/ */
#undef ImageList_AddIcon
INT WINAPI INT WINAPI ImageList_AddIcon (HIMAGELIST himl, HICON hIcon)
ImageList_AddIcon (HIMAGELIST himl, HICON hIcon)
{ {
return ImageList_ReplaceIcon (himl, -1, hIcon); return ImageList_ReplaceIcon (himl, -1, hIcon);
} }

1
dlls/ntdll/signal_i386.c
View File

@ -424,6 +424,7 @@ static wine_signal_handler handlers[256];
static sigset_t all_sigs; static sigset_t all_sigs;
extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT );
/*********************************************************************** /***********************************************************************
* dispatch_signal * dispatch_signal

1
dlls/ntdll/signal_powerpc.c
View File

@ -78,6 +78,7 @@ static wine_signal_handler handlers[256];
static sigset_t all_sigs; static sigset_t all_sigs;
extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT );
/*********************************************************************** /***********************************************************************
* dispatch_signal * dispatch_signal

1
dlls/ntdll/signal_sparc.c
View File

@ -51,6 +51,7 @@ static wine_signal_handler handlers[256];
static sigset_t all_sigs; static sigset_t all_sigs;
extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT );
/*********************************************************************** /***********************************************************************
* dispatch_signal * dispatch_signal

3
include/commctrl.h
View File

@ -554,7 +554,6 @@ typedef struct _IMAGELISTDRAWPARAMS
INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP); INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
INT WINAPI ImageList_AddIcon (HIMAGELIST, HICON);
INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF); INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT); BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT);
BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,INT); BOOL WINAPI ImageList_Copy(HIMAGELIST,INT,HIMAGELIST,INT,INT);
@ -599,9 +598,7 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM);
#endif #endif
#ifndef __WINE__
#define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon) #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)
#endif
#define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0) #define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0)
#define ImageList_LoadBitmap(hi,lpbmp,cx,cGrow,crMask) \ #define ImageList_LoadBitmap(hi,lpbmp,cx,cGrow,crMask) \
ImageList_LoadImage(hi,lpbmp,cx,cGrow,crMask,IMAGE_BITMAP,0) ImageList_LoadImage(hi,lpbmp,cx,cGrow,crMask,IMAGE_BITMAP,0)

8
include/d3d8types.h
View File

@ -988,13 +988,7 @@ typedef struct _D3DADAPTER_IDENTIFIER8 {
char Driver[MAX_DEVICE_IDENTIFIER_STRING]; char Driver[MAX_DEVICE_IDENTIFIER_STRING];
char Description[MAX_DEVICE_IDENTIFIER_STRING]; char Description[MAX_DEVICE_IDENTIFIER_STRING];
#if defined(_WIN32) || defined(__WINE__) LARGE_INTEGER DriverVersion;
LARGE_INTEGER DriverVersion; /* Defined for 32-bit components */
#else
DWORD DriverVersionLowPart; /* Defined for 16-bit driver components */
DWORD DriverVersionHighPart;
#endif
DWORD VendorId; DWORD VendorId;
DWORD DeviceId; DWORD DeviceId;
DWORD SubSysId; DWORD SubSysId;

2
include/msvcrt/eh.h
View File

@ -21,7 +21,7 @@
#define __WINE_EH_H #define __WINE_EH_H
#define __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT
#if !defined(__cplusplus) && !defined(__WINE__) #if !defined(__cplusplus) && !defined(USE_MSVCRT_PREFIX)
#error "eh.h is meant only for C++ applications" #error "eh.h is meant only for C++ applications"
#endif #endif

6
include/msvcrt/stdio.h
View File

@ -140,11 +140,7 @@ MSVCRT(FILE)* MSVCRT(__p__iob)(void);
#define stdin (_iob+STDIN_FILENO) #define stdin (_iob+STDIN_FILENO)
#define stdout (_iob+STDOUT_FILENO) #define stdout (_iob+STDOUT_FILENO)
#define stderr (_iob+STDERR_FILENO) #define stderr (_iob+STDERR_FILENO)
#elif !defined(__WINE__) #endif /* USE_MSVCRT_PREFIX */
#define MSVCRT_stdin (_iob+STDIN_FILENO)
#define MSVCRT_stdout (_iob+STDOUT_FILENO)
#define MSVCRT_stderr (_iob+STDERR_FILENO)
#endif /* USE_MSVCRT_PREFIX, __WINE__ */
#ifndef MSVCRT_STDIO_DEFINED #ifndef MSVCRT_STDIO_DEFINED
#define MSVCRT_STDIO_DEFINED #define MSVCRT_STDIO_DEFINED

11
include/msvcrt/stdlib.h
View File

@ -118,16 +118,7 @@ extern unsigned int* __p__fmode(void);
#define __mb_cur_max (*__p___mb_cur_max()) #define __mb_cur_max (*__p___mb_cur_max())
#define _doserrno (*__doserrno()) #define _doserrno (*__doserrno())
#define _fmode (*_fmode) #define _fmode (*_fmode)
#elif !defined(__WINE__) #endif /* USE_MSVCRT_PREFIX */
#define MSVCRT___argc (*__p___argc())
#define MSVCRT___argv (*__p___argv())
#define MSVCRT___wargv (*__p___wargv())
#define MSVCRT__environ (*__p__environ())
#define MSVCRT__wenviron (*__p__wenviron())
#define MSVCRT___mb_cur_max (*__p___mb_cur_max())
#define MSVCRT__doserrno (*__doserrno())
#define MSVCRT__fmode (*_fmode())
#endif /* USE_MSVCRT_PREFIX, __WINE__ */
extern int* MSVCRT(_errno)(void); extern int* MSVCRT(_errno)(void);

2
include/winbase.h
View File

@ -25,9 +25,7 @@
#include "basetsd.h" #include "basetsd.h"
#include "windef.h" #include "windef.h"
#ifndef __WINE__
#include "winerror.h" #include "winerror.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
include/wine/exception.h
View File

@ -192,8 +192,4 @@ static inline EXCEPTION_FRAME * WINE_UNUSED __wine_pop_frame( EXCEPTION_FRAME *f
extern void __wine_enter_vm86( CONTEXT *context ); extern void __wine_enter_vm86( CONTEXT *context );
#ifdef __WINE__
extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT );
#endif
#endif /* __WINE_WINE_EXCEPTION_H */ #endif /* __WINE_WINE_EXCEPTION_H */