diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /loader | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/win32.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/loader/win32.c b/loader/win32.c index 39c9d65b05..b2e88a5a6d 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -4131,11 +4131,9 @@ static int expfprintf(void* stream, const char* format, ...) va_list args; int r = 0; dbgprintf("fprintf(%p, %s, ...)\n", stream, format); -#if 1 va_start(args, format); r = vfprintf((FILE*) stream, format, args); va_end(args); -#endif return r; } @@ -4424,7 +4422,6 @@ static int exp_setjmp3(void* jmpbuf, int x) : "d"(jmpbuf) // input : "eax" ); -#if 1 __asm__ volatile ( "mov %%fs:0, %%eax \n\t" // unsure @@ -4437,7 +4434,6 @@ static int exp_setjmp3(void* jmpbuf, int x) : : "eax" ); -#endif return 0; } @@ -4494,7 +4490,6 @@ static void WINAPI expGlobalMemoryStatus( return; } -#if 1 f = fopen( "/proc/meminfo", "r" ); if (f) { @@ -4542,7 +4537,6 @@ static void WINAPI expGlobalMemoryStatus( / (TotalPhysical / 100); } } else -#endif { /* FIXME: should do something for other systems */ lpmem->dwMemoryLoad = 0; |