summaryrefslogtreecommitdiffstats
path: root/loader/ldt_keeper.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-11 14:33:57 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-11 14:33:57 +0000
commit0a3901e1aebd64e78ed6033ac90fdaffd77ce68e (patch)
treef8bf73cedd6cc89be679481aeca50dac14129c70 /loader/ldt_keeper.c
parent19f5552dd17d66f305d6f70c0cd35e4abe373d8b (diff)
downloadmpv-0a3901e1aebd64e78ed6033ac90fdaffd77ce68e.tar.bz2
mpv-0a3901e1aebd64e78ed6033ac90fdaffd77ce68e.tar.xz
Remove extern "C" declarations from loader code.
Our loader code is not a general-purpose library and not used from C++. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30538 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/ldt_keeper.c')
-rw-r--r--loader/ldt_keeper.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c
index a7c250de8e..d008a2909d 100644
--- a/loader/ldt_keeper.c
+++ b/loader/ldt_keeper.c
@@ -43,19 +43,12 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47)
#define modify_ldt_ldt_s user_desc
#endif
-/* prototype it here, so we won't depend on kernel headers */
-#ifdef __cplusplus
-extern "C" {
-#endif
/// declare modify_ldt with the _syscall3 macro for older glibcs
#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0))
_syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
#else
int modify_ldt(int func, void *ptr, unsigned long bytecount);
#endif
-#ifdef __cplusplus
-}
-#endif
#else
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#include <machine/segments.h>
@@ -69,13 +62,7 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount);
/* solaris x86: add missing prototype for sysi86(), but only when sysi86(int, void*) is known to be valid */
#ifdef HAVE_SYSI86_iv
-#ifdef __cplusplus
-extern "C" {
-#endif
int sysi86(int, void*);
-#ifdef __cplusplus
-}
-#endif
#endif
#ifndef NUMSYSLDTS /* SunOS 2.5.1 does not define NUMSYSLDTS */
@@ -127,9 +114,6 @@ static unsigned int fs_ldt = TEB_SEL_IDX;
* in C++ we use static class for this...
*/
-#ifdef __cplusplus
-extern "C"
-#endif
void Setup_FS_Segment(void)
{
unsigned int ldt_desc = LDT_SEL(fs_ldt);