Changeset 5344


Ignore:
Timestamp:
Mar 21, 2001, 12:18:56 AM (25 years ago)
Author:
mike
Message:

Cleaned up DDRAW for Watcom

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/changelog

    r5343 r5344  
    1 /* $Id: changelog,v 1.1312 2001-03-20 22:57:06 bird Exp $ */
     1/* $Id: changelog,v 1.1313 2001-03-20 23:18:54 mike Exp $ */
     2
     3 2001-03-20: Michal Necasek <michalnec@volny.cz>
     4    - include/DDRAW:
     5                o Cleaned up so that it builds with Watcom. Still lots
     6                  of warnings and Watcom build doesn't seem to work right now.
    27
    38 2001-03-21: knut st. osmundsen <knut.stange.osmundsen@mynd.no>
    … …  
    2328    - GDI32:    o Check y inversion when resyncing dib section
    2429
    25  2001-03-19: Michal Necasek <michalnec@volny.cz>
    26     - include:  o Few updates/fixes for wmake. Enabled .AUTOEPEND which
    27                   seems to be working fine for DSOUND
    2830
    2931 2001-03-19: knut st. osmundsen <knut.stange.osmundsen@mynd.no>

  • trunk/include/win/options.h

    r5276 r5344  
    1 /* $Id: options.h,v 1.6 2001-02-28 20:22:44 sandervl Exp $ */
     1/* $Id: options.h,v 1.7 2001-03-20 23:18:55 mike Exp $ */
    22
    33/*
    … …  
    1212
    1313//#include "windef.h"
     14
     15#ifdef __cplusplus
     16extern "C" {
     17#endif
    1418
    1519  /* Supported languages */
    … …  
    111115extern void VERSION_ParseDosVersion( const char *arg );
    112116
     117#ifdef __cplusplus
     118}
     119#endif
     120
    113121#endif  /* __WINE_OPTIONS_H */

  • trunk/src/ddraw/OS2UTIL.CPP

    r4870 r5344  
    1 /* $Id: OS2UTIL.CPP,v 1.10 2001-01-02 18:21:39 sandervl Exp $ */
     1/* $Id: OS2UTIL.CPP,v 1.11 2001-03-20 23:18:55 mike Exp $ */
    22
    33/*
    … …  
    4949//******************************************************************************
    5050
     51extern "C" {
    5152BOOL    APIENTRY _GpiEnableYInversion (HPS hps, LONG lHeight);
     53}
    5254
    5355void InverseDC(HDC hdc, LONG lHeight)

  • trunk/src/ddraw/cio2.h

    r1746 r5344  
    1010extern "C"
    1111{
    12  int io_init1();
    13  int io_init2(short);
    14  int io_exit1();
     12 int _System io_init1();
     13 int _System io_init2(short);
     14 int _System _io_exit1();
    1515
    16  char c_inb1(short);
    17  short c_inw1(short);
    18  long c_inl1(short);
    19  void c_outb1(short,char);
    20  void c_outw1(short,short);
    21  void c_outl1(short,long);
     16 char _System c_inb1(short);
     17 short _System c_inw1(short);
     18 long _System c_inl1(short);
     19 void _System c_outb1(short,char);
     20 void _System c_outw1(short,short);
     21 void _System c_outl1(short,long);
    2222 int psw();
    2323}

  • trunk/src/ddraw/ddraw.CPP

    r5326 r5344  
    1 /* $Id: ddraw.CPP,v 1.17 2001-03-18 21:44:44 mike Exp $ */
     1/* $Id: ddraw.CPP,v 1.18 2001-03-20 23:18:55 mike Exp $ */
    22
    33/*
    … …  
    2828#include <misc.h>
    2929
     30extern "C" {
     31
    3032//******************************************************************************
    3133//******************************************************************************
    … …  
    7173
    7274//******************************************************************************
    73 typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
     75//typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
    7476//******************************************************************************
    7577HRESULT WIN32API OS2DirectDrawEnumerateA(LPDDENUMCALLBACKA lpCallback,
    … …  
    285287}//******************************************************************************
    286288
     289}

  • trunk/src/ddraw/os2fsdd.h

    r5330 r5344  
    1111#ifndef __OS2FSDD__
    1212#define __OS2FSDD__
     13
     14#ifdef __cplusplus
     15extern "C" {
     16#endif
    1317
    1418ULONG APIENTRY Gre32Entry3(ULONG,ULONG,ULONG);
    … …  
    4347#define GreResurrection(a,b,c) (BOOL) _Gre32Entry5((HDC)(a),(LONG)(b),(c),0L,NGreResurrection)
    4448
     49
     50#ifdef __cplusplus
     51}
     52#endif
     53
    4554ULONG SetSVGAMode (ULONG     ulHorRes,
    4655                   ULONG     ulVerRes,

  • trunk/src/ddraw/rectangle.cpp

    r5326 r5344  
    1 /* $Id: rectangle.cpp,v 1.4 2001-03-18 21:44:46 mike Exp $ */
     1/* $Id: rectangle.cpp,v 1.5 2001-03-20 23:18:56 mike Exp $ */
    22
    33/*
    … …  
    1010 */
    1111
    12 typedef long BOOL;
     12typedef unsigned long BOOL;
    1313
    1414#include "rectangle.h"

  • trunk/src/ddraw/rectangle.h

    r5326 r5344  
    1 /* $Id: rectangle.h,v 1.5 2001-03-18 21:44:46 mike Exp $ */
     1/* $Id: rectangle.h,v 1.6 2001-03-20 23:18:56 mike Exp $ */
    22
    33/*
    … …  
    3030/*------------------------------- Comparisons --------------------------------*/
    3131BOOL
    32   operator == ( const DDRectangle& rectangle ) const,
    33   operator != ( const DDRectangle& rectangle ) const;
     32  operator == ( const DDRectangle &rectangle ) const,
     33  operator != ( const DDRectangle &rectangle ) const;
    3434
    3535/*--------------------------------- Testing ----------------------------------*/
Note: See TracChangeset for help on using the changeset viewer.