urlmon: Remove unneeded NONAMELESSXXX directives.

Also put them in the files that need them.
This commit is contained in:
Francois Gouget 2015-03-26 15:29:22 +01:00 committed by Alexandre Julliard
parent a1edebefdf
commit 16960a425f
5 changed files with 6 additions and 3 deletions

View File

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#include "urlmon_main.h" #include "urlmon_main.h"
#include "winreg.h" #include "winreg.h"
#include "shlwapi.h" #include "shlwapi.h"

View File

@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#include "urlmon_main.h" #include "urlmon_main.h"
#include "wininet.h" #include "wininet.h"

View File

@ -20,7 +20,6 @@
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE #define CONST_VTABLE
#define NONAMELESSUNION
/* needed for IInternetZoneManagerEx2 */ /* needed for IInternetZoneManagerEx2 */
#define _WIN32_IE 0x0700 #define _WIN32_IE 0x0700

View File

@ -20,6 +20,8 @@
#include <stdarg.h> #include <stdarg.h>
#define NONAMELESSUNION
#include "urlmon_main.h" #include "urlmon_main.h"
#include "winreg.h" #include "winreg.h"

View File

@ -23,8 +23,6 @@
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"