summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-27 22:42:27 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-27 22:42:27 +0000
commit30d0116d16a40b641a4fc772435e0cbb09fe3e83 (patch)
tree814b49212bb351300b13dd77272b6c80f850e34c /loader
parent38a7d8e282893074240754cce4d00a9237d557e5 (diff)
downloadmpv-30d0116d16a40b641a4fc772435e0cbb09fe3e83.tar.bz2
mpv-30d0116d16a40b641a4fc772435e0cbb09fe3e83.tar.xz
OpenBSD, NetBSD portability patches by
Björn Sandell <biorn@dce.chalmers.se> Marcus <core@antbear.org> Bernd Ernesti <mplayer@lists.veego.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5873 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/ldt_keeper.c1
-rw-r--r--loader/win32.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c
index ecb5550d55..8ae013c616 100644
--- a/loader/ldt_keeper.c
+++ b/loader/ldt_keeper.c
@@ -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
diff --git a/loader/win32.c b/loader/win32.c
index a82346709f..291f111b1f 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -4096,7 +4096,7 @@ struct libs libraries[]={
LL(msdmo)
LL(msvfw32)
};
-
+#include "mangle.h"
static char* called_unk = "Called unk_%s\n";
static void ext_stubs(void)
{
@@ -4109,9 +4109,9 @@ static void ext_stubs(void)
"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"