Commit 1122ff8f authored by Sam Hocevar's avatar Sam Hocevar

* 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.
parent 2e743e00
/*****************************************************************************
* 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>
*
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment