Changeset 4075 for trunk/include


Ignore:
Timestamp:
Aug 23, 2000, 8:05:56 PM (25 years ago)
Author:
sandervl
Message:

updates for watcom

Location:
trunk/include
Files:
4 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/misc.h

    r3989 r4075  
    1 /* $Id: misc.h,v 1.16 2000-08-11 09:57:49 sandervl Exp $ */
     1/* $Id: misc.h,v 1.17 2000-08-23 18:05:54 sandervl Exp $ */
    22
    33/*
    … …  
    2121#if (defined(__IBMCPP__) || defined(__IBMC__))
    2222#  include <builtin.h>
    23 #endif
    24 
    2523#ifdef DEBUG
    2624  #define DebugInt3()   _interrupt(3)
    2725#else
    2826  #define DebugInt3()
     27#endif
     28
     29#else
     30#ifdef DEBUG
     31  #define DebugInt3()   _asm int 3;
     32#else
     33  #define DebugInt3()
     34#endif
     35
    2936#endif
    3037

  • trunk/include/os2sel.h

    r2544 r4075  
    1 /* $Id: os2sel.h,v 1.6 2000-01-28 12:06:58 sandervl Exp $ */
     1/* $Id: os2sel.h,v 1.7 2000-08-23 18:05:54 sandervl Exp $ */
    22/*
    33 *
    … …  
    88#define __OS2SEL_H__
    99
    10 unsigned short _System GetFS       ();
    11 unsigned short _System RestoreOS2FS();
    12 void           _System SetFS       (unsigned short selector);
    13 unsigned short _System SetReturnFS (unsigned short selector);
     10#ifdef __WATCOMC__
     11unsigned short GetFS(void);
     12#pragma aux GetFS = \
     13   "mov  ax,fs" \
     14   value [ax] \
     15   parm nomemory;
     16
     17void SetFS(unsigned short sel);
     18#pragma aux SetFS = \
     19   "mov  fs,ax" \
     20   parm [ax];
     21
     22unsigned short RestoreOS2FS(void);
     23#pragma aux RestoreOS2FS = \
     24   "mov  bx, fs" \
     25   "mov  ax, 150bh" \
     26   "mov  fs, ax" \
     27   value [bx] \
     28   modify nomemory exact [ax];
     29
     30#else
     31unsigned short SYSTEM GetFS       ();
     32unsigned short SYSTEM RestoreOS2FS();
     33void           SYSTEM SetFS       (unsigned short selector);
     34unsigned short SYSTEM SetReturnFS (unsigned short selector);
     35#endif
    1436
    1537//SvL: Checks if thread FS & exception structure are valid
    16 int            _System CheckCurFS();
     38int            SYSTEM CheckCurFS();
    1739
    1840#endif //__OS2SEL_H__

  • trunk/include/win/poppack.h

    r4 r4075  
    1 /* $Id: poppack.h,v 1.1 1999-05-24 20:19:17 ktk Exp $ */
     1/* $Id: poppack.h,v 1.2 2000-08-23 18:05:55 sandervl Exp $ */
    22
    33#ifdef __WINE_PSHPACK_H
    44#undef __WINE_PSHPACK_H
    55
    6 #if defined(__GNUC__) || defined(__SUNPRO_C) || (defined(__IBMC__) || defined(__IBMCPP__))
     6#if defined(__GNUC__) || defined(__SUNPRO_C) || (defined(__IBMC__) || defined(__IBMCPP__)) || defined(__WATCOMC__)
    77#pragma pack()
    88#elif defined(__SUNPRO_CC)

  • trunk/include/win/pshpack1.h

    r4 r4075  
    1 /* $Id: pshpack1.h,v 1.1 1999-05-24 20:19:17 ktk Exp $ */
     1/* $Id: pshpack1.h,v 1.2 2000-08-23 18:05:55 sandervl Exp $ */
    22
    33#ifndef __WINE_PSHPACK_H
    44#define __WINE_PSHPACK_H 1
    55
    6 #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || (defined(__IBMC__) || defined(__IBMCPP__))
     6#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || (defined(__IBMC__) || defined(__IBMCPP__)) || defined(__WATCOMC__)
    77#pragma pack(1)
    88#elif !defined(RC_INVOKED)

  • trunk/include/win/pshpack2.h

    r4 r4075  
    1 /* $Id: pshpack2.h,v 1.1 1999-05-24 20:19:17 ktk Exp $ */
     1/* $Id: pshpack2.h,v 1.2 2000-08-23 18:05:56 sandervl Exp $ */
    22
    33#ifndef __WINE_PSHPACK_H
    44#define __WINE_PSHPACK_H 2
    55
    6 #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || (defined(__IBMC__) || defined(__IBMCPP__))
     6#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || (defined(__IBMC__) || defined(__IBMCPP__)) || defined(__WATCOMC__)
    77#pragma pack(2)
    88#elif !defined(RC_INVOKED)

  • trunk/include/win/pshpack4.h

    r4 r4075  
    1 /* $Id: pshpack4.h,v 1.1 1999-05-24 20:19:18 ktk Exp $ */
     1/* $Id: pshpack4.h,v 1.2 2000-08-23 18:05:56 sandervl Exp $ */
    22
    33#ifndef __WINE_PSHPACK_H
    44#define __WINE_PSHPACK_H 4
    55
    6 #if defined(__GNUC__) || defined(__SUNPRO_CC) || (defined(__IBMC__) || defined(__IBMCPP__))
     6#if defined(__GNUC__) || defined(__SUNPRO_CC) || (defined(__IBMC__) || defined(__IBMCPP__)) || defined(__WATCOMC__)
    77#pragma pack(4)
    88#elif defined(__SUNPRO_C)

  • trunk/include/win/shlwapi.h

    r3645 r4075  
     1/* $Id: shlwapi.h,v 1.2 2000-08-23 18:05:56 sandervl Exp $ */
    12#ifndef __WINE_SHLWAPI_H
    23#define __WINE_SHLWAPI_H
    … …  
    89extern "C" {
    910#endif /* defined(__cplusplus) */
     11
     12BOOL WINAPI PathAppendA(LPSTR lpszPath1,LPCSTR lpszPath2);
     13BOOL WINAPI PathAppendW(LPWSTR lpszPath1,LPCWSTR lpszPath2);
     14
     15LPSTR WINAPI PathBuildRootA(LPSTR lpszPath, int drive);
     16LPWSTR WINAPI PathBuildRootW(LPWSTR lpszPath, int drive);
     17
     18LPSTR WINAPI PathGetArgsA(LPCSTR lpszPath);
     19LPWSTR WINAPI PathGetArgsW(LPCWSTR lpszPath);
     20
     21BOOL WINAPI PathRemoveFileSpecA(LPSTR lpszPath);
     22BOOL WINAPI PathRemoveFileSpecW(LPWSTR lpszPath);
     23
     24void WINAPI PathStripPathA(LPSTR lpszPath);
     25void WINAPI PathStripPathW(LPWSTR lpszPath);
     26
     27void WINAPI PathRemoveArgsA(LPSTR lpszPath);
     28void WINAPI PathRemoveArgsW(LPWSTR lpszPath);
     29
     30void WINAPI PathRemoveExtensionA(LPSTR lpszPath);
     31void WINAPI PathRemoveExtensionW(LPWSTR lpszPath);
     32
     33void WINAPI PathUnquoteSpacesA(LPSTR str);
     34void WINAPI PathUnquoteSpacesW(LPWSTR str);
     35
     36int WINAPI PathParseIconLocationA(LPSTR lpszPath);
     37int WINAPI PathParseIconLocationW(LPWSTR lpszPath);
     38
     39BOOL WINAPI PathIsDirectoryA(LPCSTR lpszPath);
     40BOOL WINAPI PathIsDirectoryW(LPCWSTR lpszPath);
     41
     42BOOL WINAPI PathFileExistsA(LPCSTR lpszPath);
     43BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath);
     44
     45BOOL WINAPI PathIsSameRootA(LPCSTR lpszPath1, LPCSTR lpszPath2);
     46BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2);
     47
     48BOOL WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR pszPath);
     49BOOL WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR pszPath);
    1050
    1151LPSTR WINAPI PathFindFileNameA(LPCSTR pPath);
    … …  
    3070#define PathIsURL WINELIB_NAME_AW(PathIsURL)
    3171
     72BOOL WINAPI PathAddExtensionA(LPSTR pszPath, LPCSTR pszExt);
     73BOOL WINAPI PathAddExtensionW(LPWSTR pszPath, LPCWSTR pszExt);
     74#define PathAddExtension WINELIB_NAME_AW(PathAddExtension)
     75
     76BOOL WINAPI PathStripToRootA(LPSTR pszPath);
     77BOOL WINAPI PathStripToRootW(LPWSTR pszPath);
     78#define PathStripToRoot WINELIB_NAME_AW(PathStripToRoot)
     79
     80LPSTR WINAPI StrChrA(LPCSTR lpStart, WORD wMatch);
     81LPWSTR WINAPI StrChrW(LPCWSTR lpStart, WCHAR wMatch);
     82#define StrChr WINELIB_NAME_AW(StrChr)
     83
     84void WINAPI PathRemoveBlanksA(LPSTR lpszPath);
     85void WINAPI PathRemoveBlanksW(LPWSTR lpszPath);
     86#define  PathRemoveBlanks WINELIB_NAME_AW(PathRemoveBlanks)
     87void WINAPI PathRemoveBlanksAW(LPVOID lpszPath);
     88
    3289#ifdef __cplusplus
    3390} /* extern "C" */

  • trunk/include/win/windef.h

    r3318 r4075  
    1 /* $Id: windef.h,v 1.23 2000-04-05 14:17:01 sandervl Exp $ */
     1/* $Id: windef.h,v 1.24 2000-08-23 18:05:56 sandervl Exp $ */
    22
    33/*
    … …  
    225225typedef float           FLOAT;
    226226#ifdef __WIN32OS2__
    227 #if (__IBMC__ < 400) && (__IBMCPP__ < 360)
     227#if (__IBMC__ < 400) && (__IBMCPP__ < 360) && !defined(__WATCOMC__)
    228228typedef double          __int64;
    229229#endif
Note: See TracChangeset for help on using the changeset viewer.