Changeset 5918 for trunk/src


Ignore:
Timestamp:
Jun 6, 2001, 7:17:21 PM (24 years ago)
Author:
bird
Message:

Fixed NONAMELESSUNION redefined warnings.

Location:
trunk/src/ole32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ole32/ole32.h

    r5472 r5918  
    1 /* $Id: ole32.h,v 1.15 2001-04-04 09:02:15 sandervl Exp $ */
     1/* $Id: ole32.h,v 1.16 2001-06-06 17:17:21 bird Exp $ */
    22/*
    33 *
    … …  
    1515#define __OLE32_H__
    1616
     17#ifndef NONAMELESSUNION
    1718#define NONAMELESSUNION
     19#endif
     20
    1821// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
    1922#define CINTERFACE 1

  • trunk/src/ole32/ole32.mak

    r5916 r5918  
    1 # $Id: ole32.mak,v 1.7 2001-06-06 17:11:17 sandervl Exp $
     1# $Id: ole32.mak,v 1.8 2001-06-06 17:17:21 bird Exp $
    22
    33#
    … …  
    2222# Overrides.
    2323#
    24 !if "$(CCENV)" == "VAC36"
    2524CDEFINES    = $(CDEFINES) -DNONAMELESSSTRUCT -DNONAMELESSUNION
    26 !endif
    2725CDEFINES    = $(CDEFINES) -DWINE_LARGE_INTEGER
     26
    2827
    2928#
    … …  
    6160$(OBJDIR)\stubs.obj \
    6261$(OBJDIR)\ifs.obj \
    63 $(OBJDIR)\ole32rsrc.obj 
     62$(OBJDIR)\ole32rsrc.obj
    6463
    6564

  • trunk/src/ole32/olestd.h

    r5602 r5918  
    88#define __WINE_OLESTD_H_
    99
    10 #if !defined(__cplusplus) && !defined( __TURBOC__)
     10#if !defined(__cplusplus) && !defined( __TURBOC__) && !defined(NONAMELESSUNION)
    1111#define NONAMELESSUNION     /* use strict ANSI standard (for DVOBJ.H) */
    1212#endif
Note: See TracChangeset for help on using the changeset viewer.