X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Ferror.c;h=774ccd85dd83dd301c82a5d6abeb3077ef779bc3;hb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;hp=86656b17cd7bb53a695b338b4bb17938c23f9dcb;hpb=ebda60f20b1937b279a78ca6ab37f7a1b70b32fd;p=vlc

diff --git a/src/misc/error.c b/src/misc/error.c
index 86656b17cd..774ccd85dd 100644
--- a/src/misc/error.c
+++ b/src/misc/error.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * error.c: error handling routine
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: error.c,v 1.1 2002/10/14 16:35:18 sam Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 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
@@ -18,12 +18,16 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
 /*****************************************************************************
@@ -43,6 +47,8 @@ char const * vlc_error ( int i_err )
             return "not enough memory";
         case VLC_ETHREAD:
             return "thread error";
+        case VLC_ETIMEOUT:
+            return "timeout";
 
         case VLC_ENOMOD:
             return "module not found";
@@ -62,7 +68,7 @@ char const * vlc_error ( int i_err )
         case VLC_EGENERIC:
             return "generic error";
         default:
-            return "unkown error";
+            return "unknown error";
     }
 }