diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:53:54 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:55:13 +0300 |
| commit | d136cf68827382ad710adb74d02e50364052f430 (patch) | |
| tree | df40e0284c9275bb185bc098cc3ed039bb765692 /loader | |
| parent | cf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff) | |
| parent | 83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff) | |
| download | mpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2 mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz | |
Merge svn changes up to r29134
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/drv.c | 3 | ||||
| -rw-r--r-- | loader/ext.c | 3 | ||||
| -rw-r--r-- | loader/win32.c | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/loader/drv.c b/loader/drv.c index e3fb4da116..43d9485646 100644 --- a/loader/drv.c +++ b/loader/drv.c @@ -7,9 +7,6 @@ #include "debug.h" #include <stdio.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include <stdlib.h> #ifdef __FreeBSD__ #include <sys/time.h> diff --git a/loader/ext.c b/loader/ext.c index 0486f7c09b..b57eed674b 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -14,9 +14,6 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include <unistd.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> diff --git a/loader/win32.c b/loader/win32.c index 3aded84674..4287c5b0b1 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -53,9 +53,6 @@ for DLL to know too much about its environment. #include <ctype.h> #include <pthread.h> #include <errno.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include <time.h> #include <math.h> #include <unistd.h> |