[MPlayer-cvslog] r27031 - in trunk: Makefile loader/afl.c loader/dmo/dmo.c loader/driver.c loader/driver.h loader/drv.c loader/drv.h loader/dshow/DS_Filter.c loader/module.c loader/vfl.c

[diego]

Author: diego
Date: Sun Jun  8 12:43:30 2008
New Revision: 27031

Log:
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.


Added:
   trunk/loader/drv.c
      - copied, changed from r27025, /trunk/loader/driver.c
   trunk/loader/drv.h
      - copied, changed from r27025, /trunk/loader/driver.h
Removed:
   trunk/loader/driver.c
   trunk/loader/driver.h
Modified:
   trunk/Makefile
   trunk/loader/afl.c
   trunk/loader/dmo/dmo.c
   trunk/loader/dshow/DS_Filter.c
   trunk/loader/module.c
   trunk/loader/vfl.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Jun  8 12:43:30 2008
@@ -464,7 +464,7 @@ SRCS_COMMON-$(WIN32DLL)              += 
                                         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 \

Modified: trunk/loader/afl.c
==============================================================================
--- trunk/loader/afl.c	(original)
+++ trunk/loader/afl.c	Sun Jun  8 12:43:30 2008
@@ -37,7 +37,7 @@
 #ifndef __MINGW32__
 #include "ext.h"
 #endif
-#include "driver.h"
+#include "drv.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/loader/dmo/dmo.c
==============================================================================
--- trunk/loader/dmo/dmo.c	(original)
+++ trunk/loader/dmo/dmo.c	Sun Jun  8 12:43:30 2008
@@ -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>

Copied: trunk/loader/drv.c (from r27025, /trunk/loader/driver.c)
==============================================================================
--- /trunk/loader/driver.c	(original)
+++ trunk/loader/drv.c	Sun Jun  8 12:43:30 2008
@@ -24,7 +24,7 @@
 #ifdef WIN32_LOADER
 #include "ldt_keeper.h"
 #endif
-#include "driver.h"
+#include "drv.h"
 #ifndef __MINGW32__
 #include "ext.h"
 #endif

Copied: trunk/loader/drv.h (from r27025, /trunk/loader/driver.h)
==============================================================================
--- /trunk/loader/driver.h	(original)
+++ trunk/loader/drv.h	Sun Jun  8 12:43:30 2008
@@ -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 */

Modified: trunk/loader/dshow/DS_Filter.c
==============================================================================
--- trunk/loader/dshow/DS_Filter.c	(original)
+++ trunk/loader/dshow/DS_Filter.c	Sun Jun  8 12:43:30 2008
@@ -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>

Modified: trunk/loader/module.c
==============================================================================
--- trunk/loader/module.c	(original)
+++ trunk/loader/module.c	Sun Jun  8 12:43:30 2008
@@ -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"

Modified: trunk/loader/vfl.c
==============================================================================
--- trunk/loader/vfl.c	(original)
+++ trunk/loader/vfl.c	Sun Jun  8 12:43:30 2008
@@ -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