[Mplayer-cvslog] CVS: main/loader ldt_keeper.c,1.7,1.8 win32.c,1.56,1.57

[Arpi of Ize]

Update of /cvsroot/mplayer/main/loader
In directory mail:/var/tmp.root/cvs-serv19906/loader

Modified Files:
	ldt_keeper.c win32.c 
Log Message:
OpenBSD, NetBSD portability patches by
Björn Sandell <biorn at dce.chalmers.se>
Marcus <core at antbear.org>
Bernd Ernesti <mplayer at lists.veego.de>


Index: ldt_keeper.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/ldt_keeper.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ldt_keeper.c	21 Apr 2002 01:39:36 -0000	1.7
+++ ldt_keeper.c	27 Apr 2002 22:42:26 -0000	1.8
@@ -21,6 +21,7 @@
 #include <asm/ldt.h>
 #else
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <machine/segments.h>
 #include <machine/sysarch.h>
 #endif
 

Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- win32.c	23 Apr 2002 15:12:22 -0000	1.56
+++ win32.c	27 Apr 2002 22:42:26 -0000	1.57
@@ -4096,7 +4096,7 @@
     LL(msdmo)
     LL(msvfw32)
 };
-
+#include "mangle.h"
 static char* called_unk = "Called unk_%s\n";
 static void ext_stubs(void)
 {
@@ -4109,9 +4109,9 @@
 	 "movl $0, %eax		\n\t"
 	 "movl $0, %edx		\n\t"
 	 "shl $5,%eax		\n\t"			// ax * 32
-	 "addl $export_names,%eax \n\t"
+	 "addl $"MANGLE(export_names)",%eax \n\t"
 	 "pushl %eax		\n\t"
-	 "pushl called_unk	\n\t"
+	 "pushl "MANGLE(called_unk)"	\n\t"
 	 "call *%edx		\n\t"                   // printf (via dx)
 	 "addl $8,%esp		\n\t"
 	 "xorl %eax,%eax	\n\t"