From 0aba4bc7fbaec7fbe27974b43c29c62354c74254 Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Mon, 15 Sep 2003 10:40:11 +0000 Subject: [PATCH] Use STATIC=static for watcom C (statics are in the mapfile); remove some cruft. git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@686 6ac86273-5f31-0410-b378-82cca8765d1b --- hdr/device.h | 3 --- hdr/portab.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hdr/device.h b/hdr/device.h index 0d28abd..53167d7 100644 --- a/hdr/device.h +++ b/hdr/device.h @@ -112,9 +112,6 @@ static BYTE *device_hRcsId = #ifndef FALSE #define FALSE 0 #endif -#define mk_offset(far_ptr) ((UWORD)(far_ptr)) -#define mk_segment(far_ptr) ((UWORD)((ULONG)(far_ptr) >> 16)) -#define far_ptr(seg, off) ((VOID FAR *)(((ULONG)(off))+((ULONG)(seg) << 16))) /* * structures diff --git a/hdr/portab.h b/hdr/portab.h index 6600a89..eecd53a 100644 --- a/hdr/portab.h +++ b/hdr/portab.h @@ -194,7 +194,7 @@ typedef unsigned short CLUSTER; #endif typedef unsigned short UNICODE; -#ifdef STATICS +#if defined(STATICS) || defined(__WATCOMC__) #define STATIC static /* local calls inside module */ #else #define STATIC