From 52b2878abe3ec9e1f2517502a92b993f370215a3 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 22 Sep 2000 22:18:41 +0000 Subject: [PATCH] Added a macro for _declspec (backward compatibility synonym of __declspec). Removed the dllimport and dllexport macros. --- include/windef.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/windef.h b/include/windef.h index e60f3513a02..52a6d4b4bd4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -141,9 +141,8 @@ extern "C" { #define WINAPIV __cdecl #define APIENTRY WINAPI +#define _declspec(x) #define __declspec(x) -#define dllimport -#define dllexport #define CONST const @@ -395,7 +394,7 @@ typedef LRESULT CALLBACK (*WNDPROC)(HWND,UINT,WPARAM,LPARAM); /* macros to set parts of a DWORD (not in the Windows API) */ #define SET_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD(val)) #define SET_LOBYTE(dw,val) ((dw) = ((dw) & 0xffffff00) | LOBYTE(val)) -#define SET_HIBYTE(dw,val) ((dw) = ((dw) & 0xffff00ff) | (LOWORD(val) & 0xff00)) +#define SET_HIBYTE(dw,val) ((dw) = ((dw) & 0xffff00ff) | (LOBYTE(val) << 8)) #define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val))) #endif