Commit 864ca068 authored by Alexandre Julliard's avatar Alexandre Julliard

winnls.h must not include winbase.h.

parent 0611f902
...@@ -35,8 +35,9 @@ ...@@ -35,8 +35,9 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winnls.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winnls.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wownt32.h" #include "wownt32.h"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winnls.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winnls.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "heap.h" #include "heap.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winerror.h" #include "winerror.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "msacm.h" #include "msacm.h"
#include "mmreg.h" #include "mmreg.h"
#include "../msacmdrv.h" #include "../msacmdrv.h"
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "msacm.h" #include "msacm.h"
#include "mmreg.h" #include "mmreg.h"
#include "../msacmdrv.h" #include "../msacmdrv.h"
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "msacm.h" #include "msacm.h"
#include "mmreg.h" #include "mmreg.h"
#include "../msacmdrv.h" #include "../msacmdrv.h"
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "msacm.h" #include "msacm.h"
#include "mmreg.h" #include "mmreg.h"
#include "../msacmdrv.h" #include "../msacmdrv.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winnt.h" #include "winnt.h"
#include "winternl.h" #include "winternl.h"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "winerror.h" #include "winerror.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
#include "winuser.h" #include "winuser.h"
......
...@@ -63,8 +63,9 @@ ...@@ -63,8 +63,9 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "winerror.h" #include "winerror.h"
#include "winnls.h" /* for PRIMARYLANGID */ #include "winbase.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */ #include "winnls.h"
#include "winreg.h"
#include "winuser.h" #include "winuser.h"
#include "wine/unicode.h" #include "wine/unicode.h"
......
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
#include <ctype.h> #include <ctype.h>
#include "winerror.h" #include "winerror.h"
#include "winnls.h" /* for PRIMARYLANGID */ #include "winbase.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */ #include "winnls.h"
#include "winreg.h"
#include "winuser.h" #include "winuser.h"
#include "objbase.h" #include "objbase.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <ctype.h> #include <ctype.h>
#include "wine/debug.h" #include "wine/debug.h"
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h"
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "servprov.h" #include "servprov.h"
#include "shlguid.h" #include "shlguid.h"
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "shlobj.h" #include "shlobj.h"
#include "shellapi.h" #include "shellapi.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
#include "shlguid.h" #include "shlguid.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wine/debug.h" #include "wine/debug.h"
#define NO_SHLWAPI_REG #define NO_SHLWAPI_REG
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wininet.h" #include "wininet.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "gdi.h" #include "gdi.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -35,9 +35,10 @@ ...@@ -35,9 +35,10 @@
#endif #endif
#include "mmsystem.h" #include "mmsystem.h"
#include "winnls.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "winemm.h" #include "winemm.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <math.h> #include <math.h>
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "x11font.h" #include "x11font.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <math.h> #include <math.h>
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wownt32.h" #include "wownt32.h"
#include "gdi.h" #include "gdi.h"
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <math.h> #include <math.h>
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#define __WINE_WINNLS_H #define __WINE_WINNLS_H
#ifndef NONLS #ifndef NONLS
#include "winbase.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "winternl.h" #include "winternl.h"
#include "winerror.h" #include "winerror.h"
#include "wine/exception.h" #include "wine/exception.h"
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "winternl.h" #include "winternl.h"
#include "callback.h" #include "callback.h"
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "gdi.h" #include "gdi.h"
#include "wine/debug.h" #include "wine/debug.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "winerror.h" #include "winerror.h"
#include "winbase.h"
#include "winnls.h" #include "winnls.h"
#include "wownt32.h" #include "wownt32.h"
#include "gdi.h" #include "gdi.h"
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#endif #endif
#undef KEY_EVENT /* avoid redefinition warning */ #undef KEY_EVENT /* avoid redefinition warning */
#include <unistd.h> #include <unistd.h>
#include <winbase.h>
#include <winnls.h> #include <winnls.h>
#include "winecon_private.h" #include "winecon_private.h"
......
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "controls.h" #include "controls.h"
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/server.h" #include "wine/server.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment