From 3bbe897e247d128cf63f1fad665fdfc086bab5ab Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 20 Jan 2008 17:16:39 +0000 Subject: Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a capital letter are reserved for the system, those starting with _ are reserved at the file level. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/wine/ldt.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'loader/wine/ldt.h') diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h index 0304ccbf9a..b750302540 100644 --- a/loader/wine/ldt.h +++ b/loader/wine/ldt.h @@ -48,11 +48,11 @@ typedef struct extern ldt_copy_entry ldt_copy[LDT_SIZE]; -#define __AHSHIFT 3 /* don't change! */ -#define __AHINCR (1 << __AHSHIFT) +#define AHSHIFT 3 /* don't change! */ +#define AHINCR (1 << AHSHIFT) -#define SELECTOR_TO_ENTRY(sel) (((int)(sel) & 0xffff) >> __AHSHIFT) -#define ENTRY_TO_SELECTOR(i) ((i) ? (((int)(i) << __AHSHIFT) | 7) : 0) +#define SELECTOR_TO_ENTRY(sel) (((int)(sel) & 0xffff) >> AHSHIFT) +#define ENTRY_TO_SELECTOR(i) ((i) ? (((int)(i) << AHSHIFT) | 7) : 0) #define IS_LDT_ENTRY_FREE(i) (!(ldt_flags_copy[(i)] & LDT_FLAGS_ALLOCATED)) #define IS_SELECTOR_FREE(sel) (IS_LDT_ENTRY_FREE(SELECTOR_TO_ENTRY(sel))) #define GET_SEL_BASE(sel) (ldt_copy[SELECTOR_TO_ENTRY(sel)].base) @@ -67,7 +67,7 @@ extern ldt_copy_entry ldt_copy[LDT_SIZE]; #define PTR_SEG_OFF_TO_SEGPTR(seg,off) \ ((SEGPTR)MAKELONG(off,seg)) #define PTR_SEG_OFF_TO_HUGEPTR(seg,off) \ - PTR_SEG_OFF_TO_SEGPTR( (seg) + (HIWORD(off) << __AHSHIFT), LOWORD(off) ) + PTR_SEG_OFF_TO_SEGPTR( (seg) + (HIWORD(off) << AHSHIFT), LOWORD(off) ) #define W32S_APPLICATION() (PROCESS_Current()->flags & PDB32_WIN32S_PROC) #define W32S_OFFSET 0x10000 -- cgit v1.2.3