Changeset 17 for trunk/include


Ignore:
Timestamp:
Jun 1, 1999, 12:08:16 AM (26 years ago)
Author:
phaller
Message:

Code cleanup #1 for build, mainly addresses linkage problems

Location:
trunk/include
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/OS2WIN.H

    r13 r17  
    1 /* $Id: OS2WIN.H,v 1.3 1999-05-31 17:04:18 phaller Exp $ */
     1/* $Id: OS2WIN.H,v 1.4 1999-05-31 22:08:07 phaller Exp $ */
    22
    33#ifndef _OS2WIN_H
    44#define _OS2WIN_H
    55
    6 #include "misc.h"
     6#include <odin.h>
    77
    88#include <windef.h>

  • trunk/include/misc.h

    r14 r17  
    1 /* $Id: misc.h,v 1.4 1999-05-31 17:12:38 phaller Exp $ */
     1/* $Id: misc.h,v 1.5 1999-05-31 22:08:08 phaller Exp $ */
     2
     3/*
     4 * Miscellaneous definitions
     5 * Debug prototypes and macros
     6 */
     7
    28
    39#ifndef __MISC_H__
    … …  
    713      extern "C" {
    814#endif
    9 
    10 /*
    11  * Compiler Environment Definition
    12  */
    13 
    14 /* ---------- WATCOM C ---------- */
    15 #ifdef __WATCOMC__
    16   #define CDECL     _cdecl
    17   #define EXPORT    _export
    18   #define WIN32API  __stdcall
    19   #define SYSTEM    __stdcall
    20 #else
    21 
    22 /* ---------- GCC/EMX ---------- */
    23 #ifdef __GNUC__
    24   #define CDECL     _cdecl
    25   #define EXPORT    _export
    26   #define WIN32API  __stdcall
    27   #define SYSTEM    __stdcall
    28 #else
    29 
    30 /* ---------- VAC ---------- */
    31 #ifdef __IBMCPP__
    32   #define CDECL     _Cdecl
    33   #define EXPORT    _Export
    34   #define WIN32API  _System _Export
    35   #define SYSTEM    _System
    36 #else
    37 
    38 /* ---------- ??? ---------- */
    39 #error No known compiler.
    40 #endif
    41 #endif
    42 #endif
    43 
    44 
    45 /* map WINE to ODIN */
    46 #define WINAPI WIN32API
    47 #include <builtin.h>
    4815
    4916
    … …  
    6734#endif
    6835
     36
     37#ifndef ULONG
     38#  define ULONG unsigned long
     39#endif
     40
     41#ifndef HMODULE
     42#  define HMODULE ULONG
     43#endif
     44
     45#ifndef SYSTEM
     46#  define SYSTEM _System
     47#endif
     48
     49
    6950int  SYSTEM WriteLog(char *tekst, ...);
    7051int  SYSTEM WriteLogError(char *tekst, ...);
    … …  
    8465#include "unicode.h"
    8566
     67
    8668#endif

  • trunk/include/win32type.h

    r10 r17  
    1 /* $Id: win32type.h,v 1.2 1999-05-27 15:17:59 phaller Exp $ */
     1/* $Id: win32type.h,v 1.3 1999-05-31 22:08:08 phaller Exp $ */
    22
    33#ifndef __WIN32TYPE_H__
    … …  
    77#define FAR
    88#define UNALIGNED
     9
     10
     11#ifndef VOID
     12#  define VOID void
     13#endif
     14
     15#ifndef LONG
     16#  define LONG long
     17#endif
     18
     19#ifndef ULONG
     20#  define ULONG unsigned long
     21#endif
     22
     23#ifndef SHORT
     24#  define SHORT short
     25#endif
     26
     27#ifndef USHORT
     28#  define USHORT unsigned short
     29#endif
     30
     31#ifndef CHAR
     32#  define CHAR char
     33#endif
     34
     35#ifndef UCHAR
     36#  define UCHAR unsigned char
     37#endif
     38
     39
    940
    1041#define LPVOID  VOID *

  • trunk/include/winos2def.h

    r10 r17  
    1 /* $Id: winos2def.h,v 1.2 1999-05-27 15:17:59 phaller Exp $ */
     1/* $Id: winos2def.h,v 1.3 1999-05-31 22:08:08 phaller Exp $ */
    22
    33/*
    … …  
    1212#define __WINOS2DEF_H__
    1313
    14 #define APIENTRY_OS2    _System
     14#define APIENTRY_OS2    _System
    1515
    16 typedef unsigned long   HMODULE;
     16/*
     17typedef unsigned long   HMODULE;
    1718typedef unsigned long   HINSTANCE;
    18 //typedef unsigned long         ULONG;
    19 typedef char *          PSZ;
    20 typedef ULONG           MPARAM;
    21 typedef ULONG           APIRET;
     19//typedef unsigned long         ULONG;
     20typedef char *          PSZ;
     21typedef ULONG           MPARAM;
     22typedef ULONG           APIRET;
     23*/
     24
     25#ifndef MPARAM
     26#  define MPARAM void*
     27#endif
     28
     29#ifndef APIRET
     30#  define APIRET ULONG
     31#endif
     32
    2233
    2334extern "C" {
Note: See TracChangeset for help on using the changeset viewer.