X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Ferror.c;h=7cd911483937e8f30d10d3e4e092b4cd441f642c;hb=6ba3c4bed4985f4d9602074941b712f90f128454;hp=e548d4df48b666c87daa9a0de7dc9fdc125493d0;hpb=1e67ea66dcb1f5aa9add966a3563b98b9cd3ccca;p=vlc

diff --git a/src/misc/error.c b/src/misc/error.c
index e548d4df48..7cd9114839 100644
--- a/src/misc/error.c
+++ b/src/misc/error.c
@@ -1,36 +1,40 @@
 /*****************************************************************************
  * error.c: error handling routine
  *****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
- * $Id: error.c,v 1.4 2004/01/25 17:16:06 zorglub Exp $
+ * Copyright (C) 2002-2004 VLC authors and VideoLAN
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 /*****************************************************************************
  * vlc_error: strerror() equivalent
  *****************************************************************************
  * This function returns a string describing the error code passed in the
- * argument. A list of all errors can be found in include/vlc/vlc.h.
+ * argument. A list of all errors can be found in include/vlc_common.h.
  *****************************************************************************/
 char const * vlc_error ( int i_err )
 {
@@ -41,8 +45,6 @@ char const * vlc_error ( int i_err )
 
         case VLC_ENOMEM:
             return "not enough memory";
-        case VLC_ETHREAD:
-            return "thread error";
         case VLC_ETIMEOUT:
             return "timeout";
 
@@ -51,16 +53,12 @@ char const * vlc_error ( int i_err )
 
         case VLC_ENOOBJ:
             return "object not found";
-        case VLC_EBADOBJ:
-            return "bad object type";
 
         case VLC_ENOVAR:
             return "variable not found";
         case VLC_EBADVAR:
             return "bad variable value";
 
-        case VLC_EEXIT:
-            return "program exited";
         case VLC_EGENERIC:
             return "generic error";
         default: