From f49a3937c8040a3aa1e53660897ba0b627b2b28e Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 30 Sep 2004 09:08:17 +0000 Subject: * include/winbase.h (WINBASEAPI): Define as DECLSPEC_IMPORT only if __W32API_USE_DLLIMPORT__ is defined. * include/winuser.h (WINUSERAPI): Likewise. --- winsup/w32api/ChangeLog | 6 ++++++ winsup/w32api/include/winbase.h | 8 ++++---- winsup/w32api/include/winuser.h | 3 +-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'winsup/w32api') diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index dccf7e424..0789e023f 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2004-09-30 Danny Smith + + * include/winbase.h (WINBASEAPI): Define as DECLSPEC_IMPORT only + if __W32API_USE_DLLIMPORT__ is defined. + * include/winuser.h (WINUSERAPI): Likewise. + 2004-09-29 Filip Navara * include/ddk/(atm.h, batclass.h, cfg.h, cfgmgr32.h, d4drvif.h, diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index c362d7b4b..ad82353e7 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -5,13 +5,13 @@ #endif #ifndef WINBASEAPI -#ifdef __INSIDE_CYGWIN__ -#define WINBASEAPI -#else +#ifdef __W32API_USE_DLLIMPORT__ #define WINBASEAPI DECLSPEC_IMPORT +#else +#define WINBASEAPI #endif - #endif + #ifdef __cplusplus extern "C" { #endif diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index a5aaf6892..c256f3fe9 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -9,14 +9,13 @@ extern "C" { #endif #ifndef WINUSERAPI -#ifndef __INSIDE_CYGWIN__ +#ifdef __W32API_USE_DLLIMPORT__ #define WINUSERAPI DECLSPEC_IMPORT #else #define WINUSERAPI #endif #endif - #define WC_DIALOG MAKEINTATOM(0x8002) #define FALT 16 #define FCONTROL 8 -- cgit v1.2.3