diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
commit | 36e7a20e695b376287310d602b44d6719f82a021 (patch) | |
tree | 75070d702043e875c947fccaa2de7a419331de22 /loader/wine/ldt.h | |
parent | 70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff) | |
parent | 93abb4f09229730c30e5bbdd6c54d4b981995eee (diff) | |
download | mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2 mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz |
Merge svn changes up to r30550
Diffstat (limited to 'loader/wine/ldt.h')
-rw-r--r-- | loader/wine/ldt.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h index e3f511b062..e607085f33 100644 --- a/loader/wine/ldt.h +++ b/loader/wine/ldt.h @@ -26,10 +26,6 @@ typedef struct int limit_in_pages; /* is the limit in pages or bytes? */ enum seg_type type; /* segment type */ } ldt_entry; -#ifdef __cplusplus -extern "C" -{ -#endif void LDT_BytesToEntry( const unsigned long *buffer, ldt_entry *content ); void LDT_EntryToBytes( unsigned long *buffer, const ldt_entry *content ); int LDT_GetEntry( int entry, ldt_entry *content ); @@ -92,8 +88,5 @@ extern unsigned char ldt_flags_copy[LDT_SIZE]; (!((sel) & 4) || (SELECTOR_TO_ENTRY(sel) < FIRST_LDT_ENTRY_TO_ALLOC)) #define IS_SELECTOR_32BIT(sel) \ (IS_SELECTOR_SYSTEM(sel) || (GET_SEL_FLAGS(sel) & LDT_FLAGS_32BIT)) -#ifdef __cplusplus -} -#endif #endif /* MPLAYER_LDT_H */ |