Changeset 5518 for trunk/include


Ignore:
Timestamp:
Apr 16, 2001, 7:02:56 PM (24 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/odin.h

    r5288 r5518  
    7373  #define PASCAL    __stdcall
    7474  #define UNALIGNED
     75  #define NONAMELESSUNION
     76  #define NONAMELESSSTRUCT
    7577#else
    7678
    … …  
    8789
    8890#ifndef RC_INVOKED
    89   #if (__IBMCPP__ == 300) || (__IBMC__ == 300)
     91  #if (__IBMC__ == 300)
    9092  #define NONAMELESSUNION
     93  #endif
     94  #if (__IBMCPP__ == 300) | (__IBMC__ == 300)
     95  #define NONAMELESSSTRUCT
    9196  #endif
    9297#endif
    … …  
    97102
    98103#else
    99 
    100 #ifndef RC_INVOKED
     104#ifdef RC_INVOKED
     105  //SvL: wrc chokes on calling conventions....
     106  #define CDECL     
     107  #define EXPORT   
     108  #define WIN32API 
     109  #define WINAPI   
     110  #define CALLBACK   
     111  #define SYSTEM   
     112  #define PASCAL   
     113  #define UNALIGNED
     114  #define __cdecl
     115  #define _System
     116  #define __inline__
     117#else
    101118/* ---------- ??? ---------- */
    102119#error No known compiler.

  • trunk/include/odinrsrc.h

    r1251 r5518  
    1 /* $Id: odinrsrc.h,v 1.1 1999-10-11 20:15:47 sandervl Exp $ */
     1/* $Id: odinrsrc.h,v 1.2 2001-04-16 17:02:51 sandervl Exp $ */
    22/*
    33 * ODIN - Version resource constants

  • trunk/include/win/windef.h

    r4841 r5518  
    1 /* $Id: windef.h,v 1.26 2000-12-27 18:31:54 sandervl Exp $ */
    2 
    31/*
    42 * Basic types definitions
    … …  
    8078
    8179
     80#include <odin.h>
     81
    8282/* define needed macros as required */
    8383#ifndef CALLBACK
    … …  
    141141#endif
    142142
     143#ifndef WIN32API
     144  #define WIN32API    WINAPI
     145#endif
     146
     147
    143148#if (__IBMC__ < 400) && (__IBMCPP__ < 360)
    144149#ifndef __declspec
    … …  
    160165
    161166/* Anonymous union/struct handling */
    162 
    163 #if defined(__WINE__) || defined(__WIN32OS2__)
    164 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
    165 # undef NONAMELESSSTRUCT
    166 # undef NONAMELESSUNION
    167 #else
    168 # define NONAMELESSSTRUCT
    169 # define NONAMELESSUNION
    170 #endif
    171 #else
    172 /* Anonymous struct support starts with gcc/g++ 2.96 */
    173 # if !defined(NONAMELESSSTRUCT) && defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ < 96)))
    174 #  define NONAMELESSSTRUCT
    175 # endif
    176 /* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
    177 # if !defined(NONAMELESSUNION) && defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus)))))
    178 #  define NONAMELESSUNION
    179 # endif
    180 #endif
    181167
    182168#ifndef NONAMELESSSTRUCT

  • trunk/include/win/winnls.h

    r5453 r5518  
    1 /* $Id: winnls.h,v 1.5 2001-04-03 14:11:53 sandervl Exp $ */
     1/* $Id: winnls.h,v 1.6 2001-04-16 17:02:54 sandervl Exp $ */
    22
    33#ifndef __WINE_WINNLS_H
    … …  
    272272#define LANG_ESPERANTO                          0x8f
    273273#define LANG_WALON                              0x90
     274#define LANG_CORNISH                            0x91
     275#define LANG_WELSH                              0x92
     276#define LANG_BRETON                             0x93
    274277
    275278/* Sublanguage definitions */

  • trunk/include/win/winuser.h

    r5403 r5518  
    1 /* $Id: winuser.h,v 1.44 2001-03-30 11:13:35 sandervl Exp $ */
    2 
    31#ifndef __INCLUDE_WINUSER_H
    42#define __INCLUDE_WINUSER_H
    … …  
    97#include "windef.h"
    108#include "wingdi.h"
    11 #ifndef __WIN32OS2__
    12 #include "wine/winestring.h"
    13 #endif
    149
    1510#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.