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

Attempt at a better fix for the winsock.h problems on Darwin.

This commit is contained in:
Alexandre Julliard 2005-06-30 21:13:00 +00:00
parent 85ecdd308c
commit 07dd5a7e86
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wine/test.h
View File

@ -21,7 +21,10 @@
#ifndef __WINE_TEST_H #ifndef __WINE_TEST_H
#define __WINE_TEST_H #define __WINE_TEST_H
#include <windows.h> #include <stdarg.h>
#include <stdlib.h>
#include <windef.h>
#include <winbase.h>
/* debug level */ /* debug level */
extern int winetest_debug; extern int winetest_debug;

14
include/winsock.h
View File

@ -56,6 +56,20 @@
# define FD_ISSET Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library # define FD_ISSET Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# define fd_set Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library # define fd_set Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# define select Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library # define select Include_winsock_h_before_stdlib_h_or_use_the_MSVCRT_library
# elif defined(RLIM_INFINITY)
/* On Darwin stdlib.h includes sys/resource.h which defines timeval but not the fd_set macros */
# define fd_set unix_fd_set
# include <sys/types.h>
# include <time.h>
# include <stdlib.h>
# undef fd_set
# undef FD_SETSIZE
# undef FD_CLR
# undef FD_SET
# undef FD_ZERO
# undef FD_ISSET
# define select Include_winsock_h_before_sys_types_h_or_use_the_MSVCRT_library
# define timeval Include_winsock_h_before_sys_types_h_or_use_the_MSVCRT_library
# else /* FD_CLR */ # else /* FD_CLR */
/* stdlib.h has not been included yet so it's not too late. Include it now /* stdlib.h has not been included yet so it's not too late. Include it now
* making sure that none of the select symbols is affected. Then we can * making sure that none of the select symbols is affected. Then we can