From 861247d1df8e45628fdcb2ffbb710a0a759ed228 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 15 Oct 2011 13:50:26 +0000 Subject: [PATCH] [WINE/WS2_32] * Sync config.h with recent Wine and remove some now unneeded defines. By Samuel Serapion. See issue #6174 for more details. svn path=/trunk/; revision=54146 --- reactos/dll/win32/ws2_32/misc/async.c | 3 - reactos/include/reactos/wine/config.h | 632 +++++++++++++++++++------- 2 files changed, 461 insertions(+), 174 deletions(-) diff --git a/reactos/dll/win32/ws2_32/misc/async.c b/reactos/dll/win32/ws2_32/misc/async.c index d8d3701790d..7a1ee9f776b 100644 --- a/reactos/dll/win32/ws2_32/misc/async.c +++ b/reactos/dll/win32/ws2_32/misc/async.c @@ -36,9 +36,6 @@ #include #define WS_FD_SETSIZE FD_SETSIZE -#define HAVE_GETPROTOBYNAME -#define HAVE_GETPROTOBYNUMBER -#define HAVE_GETSERVBYPORT typedef struct hostent WS_hostent; typedef struct servent WS_servent; typedef struct protoent WS_protoent; diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h index 40a6d559f0f..c1e7175b9a5 100644 --- a/reactos/include/reactos/wine/config.h +++ b/reactos/include/reactos/wine/config.h @@ -1,6 +1,3 @@ -/* include/config.h. Generated by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - #include "reactos/buildno.h" #define __WINE_CONFIG_H @@ -8,17 +5,21 @@ /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ #define DECLSPEC_HOTPATCH -/* Specifies the compiler flag that forces a short wchar_t */ -#define CC_FLAG_SHORT_WCHAR "-fshort-wchar" +/* Define to the file extension for executables. */ +#define EXEEXT ".exe" -/* Define to 1 if you have the header file. */ -#define HAVE_MPG123_H 1 - -/* Define if you have ALSA 1.x including devel headers */ -/* #undef HAVE_ALSA */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ALIAS_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_ALSA_ASOUNDLIB_H */ +/*#undef HAVE_ALSA_ASOUNDLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_AL_AL_H */ + +/* Define to 1 if you have the + header file. */ +/* #undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_ARPA_INET_H */ @@ -26,32 +27,44 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ARPA_NAMESER_H */ -/* Define if you have ARTS sound server */ -/* #undef HAVE_ARTS */ +/* Define to 1 if you have the `asctime_r' function. */ +/* #undef HAVE_ASCTIME_R */ /* Define to 1 if you have the header file. */ /* #undef HAVE_ASM_TYPES_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_AUDIOUNIT_AUDIOUNIT_H */ + /* Define to 1 if you have the