mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 07:34:06 +00:00
Defined NONAMELESSUNION/STRUCT directly in the files that need it
instead of globally in the makefile.
This commit is contained in:
parent
eb585a9685
commit
ae4311c71c
|
@ -9,7 +9,7 @@
|
|||
# plus all variables required by the global Make.rules.in
|
||||
#
|
||||
|
||||
DEFS = @DLLFLAGS@ -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
|
||||
DEFS = @DLLFLAGS@ $(EXTRADEFS)
|
||||
LDDLLFLAGS = @LDDLLFLAGS@
|
||||
ALL_OBJS = $(OBJS) $(MODULE).dbg.o
|
||||
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = @DLLFLAGS@ -DNONAMELESSUNION -DNONAMELESSSTRUCT $(EXTRADEFS)
|
||||
DEFS = @DLLFLAGS@ $(EXTRADEFS)
|
||||
LDDLLFLAGS = @LDDLLFLAGS@
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
|
|
|
@ -35,6 +35,9 @@
|
|||
#include <time.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include "windows.h"
|
||||
#include "wingdi.h"
|
||||
#include "mmsystem.h"
|
||||
|
|
|
@ -58,6 +58,8 @@
|
|||
#include <limits.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include "rpcss.h"
|
||||
#include "winnt.h"
|
||||
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
* environment-variable and batch parameter substitution already done.
|
||||
*/
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include "wcmd.h"
|
||||
|
||||
int WCMD_dir_sort (const void *a, const void *b);
|
||||
|
|
|
@ -19,6 +19,9 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
#include "commctrl.h"
|
||||
#include "prsht.h"
|
||||
#include "winecon_user.h"
|
||||
|
|
Loading…
Reference in a new issue