diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 15:19:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 15:19:40 +0000 |
| commit | e978fab10babba27885fe6b8a3f8dd72fecbc792 (patch) | |
| tree | 755b19ad0256af3b44bf79c021c132288a396529 /xorg-server/hw/xwin/winprefsyacc.c | |
| parent | ce016335ab8ff2413bb82de6f74b2b96f746d07b (diff) | |
| download | vcxsrv-e978fab10babba27885fe6b8a3f8dd72fecbc792.tar.gz vcxsrv-e978fab10babba27885fe6b8a3f8dd72fecbc792.tar.bz2 vcxsrv-e978fab10babba27885fe6b8a3f8dd72fecbc792.zip | |
Synchronised with released branch.
Diffstat (limited to 'xorg-server/hw/xwin/winprefsyacc.c')
| -rw-r--r-- | xorg-server/hw/xwin/winprefsyacc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winprefsyacc.c b/xorg-server/hw/xwin/winprefsyacc.c index ccecc6e33..3ea9e96bb 100644 --- a/xorg-server/hw/xwin/winprefsyacc.c +++ b/xorg-server/hw/xwin/winprefsyacc.c @@ -417,14 +417,14 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && !defined _MSC_VER && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && !defined _MSC_VER && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif |