* include/error.h: Renamed this file to include/vlc_error.h to avoid name

    conflicts. Most headers in that directory should probably be renamed to
    their vlc_ equivalent.

diff --git a/include/error.h b/include/vlc_error.h
similarity index 92%
rename from include/error.h
rename to include/vlc_error.h
index 7befc1777a2b8094f161c8f35969e633eb44a086..786560adc58ad98b4650663279505fb2d2594691 100644 (file)
--- a/include/error.h
+++ b/include/vlc_error.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * error.h: error handling routine
+ * vlc_error.h: error handling routine
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: error.h,v 1.2 2003/01/28 02:03:32 sam Exp $
+ * $Id: vlc_error.h,v 1.1 2003/07/01 12:56:47 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *

diff --git a/modules/control/rc/rc.c b/modules/control/rc/rc.c
index c2e6306d120179358f2c9a008d458b835e716da2..8aac150ff2243c32e318f3f90a62cd11c9ff83c1 100644 (file)
--- a/modules/control/rc/rc.c
+++ b/modules/control/rc/rc.c
@@ -2,7 +2,7 @@
  * rc.c : remote control stdin/stdout plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: rc.c,v 1.34 2003/05/15 22:27:37 massiot Exp $
+ * $Id: rc.c,v 1.35 2003/07/01 12:56:47 sam Exp $
  *
  * Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
  *
@@ -46,7 +46,7 @@
 #endif
 #include <sys/types.h>
 
-#include "error.h"
+#include "vlc_error.h"
 
 #define MAX_LINE_LENGTH 256
 

diff --git a/src/libvlc.c b/src/libvlc.c
index 7c04a28664ec7fa7dcc8fe54517c1af4a12c9e6a..b7feb1ef55e703a82dc919f1fbc34b84fbb40f07 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.91 2003/06/26 12:19:59 sam Exp $
+ * $Id: libvlc.c,v 1.92 2003/07/01 12:56:47 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -63,7 +63,7 @@
 #include "vlc_cpu.h"                                        /* CPU detection */
 #include "os_specific.h"
 
-#include "error.h"
+#include "vlc_error.h"
 
 #include "stream_control.h"
 #include "input_ext-intf.h"

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 71c5a0f5bdabf57db3e2b11c994445922d53f617..0ddf9e488f5d2e00a9e3a628eb50beaeacf10cfa 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.123 2003/06/26 12:19:59 sam Exp $
+ * $Id: modules.c,v 1.124 2003/07/01 12:56:47 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -67,7 +67,7 @@
 #   undef HAVE_DYNAMIC_PLUGINS
 #endif
 
-#include "error.h"
+#include "vlc_error.h"
 
 #include "vlc_interface.h"
 #include "vlc_playlist.h"