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

Makefile

@@ -464,7 +464,7 @@ SRCS_COMMON-$(WIN32DLL)              += libmpcodecs/ad_acm.c \
                                         libmpcodecs/vd_vfwex.c \
                                         libmpdemux/demux_avs.c \
                                         loader/afl.c \
-                                        loader/driver.c \
+                                        loader/drv.c \
                                         loader/vfl.c \
                                         loader/dshow/DS_AudioDecoder.c \
                                         loader/dshow/DS_Filter.c \

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>

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>

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

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 */

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>

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"

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