diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-08 10:43:30 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-08 10:43:30 +0000 |
| commit | 4b34771463b96153c274db1b91eb425dce50208d (patch) | |
| tree | 4a8bc86666133bf3308c39ccdbb88afbcebd8fbc /loader | |
| parent | 108fff3efbb63e1160437fdfd8ed6916a9c7c0ca (diff) | |
| download | mpv-4b34771463b96153c274db1b91eb425dce50208d.tar.bz2 mpv-4b34771463b96153c274db1b91eb425dce50208d.tar.xz | |
Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can
conflict with the header by the same name in loader/wine/driver.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/afl.c | 2 | ||||
| -rw-r--r-- | loader/dmo/dmo.c | 2 | ||||
| -rw-r--r-- | loader/drv.c (renamed from loader/driver.c) | 2 | ||||
| -rw-r--r-- | loader/drv.h (renamed from loader/driver.h) | 6 | ||||
| -rw-r--r-- | loader/dshow/DS_Filter.c | 2 | ||||
| -rw-r--r-- | loader/module.c | 2 | ||||
| -rw-r--r-- | loader/vfl.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/loader/afl.c b/loader/afl.c index e919f5e4f2..36b666bb0a 100644 --- a/loader/afl.c +++ b/loader/afl.c @@ -37,7 +37,7 @@ #ifndef __MINGW32__ #include "ext.h" #endif -#include "driver.h" +#include "drv.h" #include <stdio.h> #include <stdlib.h> diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c index 5ebcbc82f7..3c5c748caf 100644 --- a/loader/dmo/dmo.c +++ b/loader/dmo/dmo.c @@ -5,7 +5,7 @@ #include "config.h" #include "DMO_Filter.h" -#include "driver.h" +#include "drv.h" #include "com.h" #include <stdio.h> #include <stdlib.h> diff --git a/loader/driver.c b/loader/drv.c index a59b28e67d..5d4f0dcb93 100644 --- a/loader/driver.c +++ b/loader/drv.c @@ -24,7 +24,7 @@ #ifdef WIN32_LOADER #include "ldt_keeper.h" #endif -#include "driver.h" +#include "drv.h" #ifndef __MINGW32__ #include "ext.h" #endif diff --git a/loader/driver.h b/loader/drv.h index 343c652811..b064b46802 100644 --- a/loader/driver.h +++ b/loader/drv.h @@ -3,8 +3,8 @@ * http://svn.mplayerhq.hu/mplayer/trunk/ */ -#ifndef MPLAYER_DRIVER_H -#define MPLAYER_DRIVER_H +#ifndef MPLAYER_DRV_H +#define MPLAYER_DRV_H #ifdef __cplusplus extern "C" { @@ -24,4 +24,4 @@ void DrvClose(HDRVR hdrvr); } #endif -#endif /* MPLAYER_DRIVER_H */ +#endif /* MPLAYER_DRV_H */ diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c index 88c82aa47f..a1619702db 100644 --- a/loader/dshow/DS_Filter.c +++ b/loader/dshow/DS_Filter.c @@ -5,7 +5,7 @@ #include "config.h" #include "DS_Filter.h" -#include "driver.h" +#include "drv.h" #include "com.h" #include <stdio.h> #include <string.h> diff --git a/loader/module.c b/loader/module.c index e316cf0f37..4945125521 100644 --- a/loader/module.c +++ b/loader/module.c @@ -45,7 +45,7 @@ #include "wine/elfdll.h" #endif #include "win32.h" -#include "driver.h" +#include "drv.h" #ifdef EMU_QTX_API #include "wrapper.h" diff --git a/loader/vfl.c b/loader/vfl.c index 91d28ee289..54d1076fa4 100644 --- a/loader/vfl.c +++ b/loader/vfl.c @@ -21,7 +21,7 @@ #include "wine/winestring.h" #include "wine/driver.h" #include "wine/avifmt.h" -#include "driver.h" +#include "drv.h" #define OpenDriverA DrvOpen #define CloseDriver DrvClose |