* ./include/vlc_threads.h: re-merged vlc_threads.h and threads_funcs.h.

include/vlc/vlc.h

@@ -2,7 +2,7 @@
  * vlc.h: global header for vlc
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc.h,v 1.1 2002/06/01 12:31:58 sam Exp $
+ * $Id: vlc.h,v 1.2 2002/06/02 13:38:03 gbazin Exp $
  *
  * 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
@@ -77,7 +77,6 @@ VLC_DECLARE_STRUCT(vlc_object)
 #   include "modules.h"
 #   include "main.h"
 #   include "configuration.h"
-#   include "threads_funcs.h"
 #   include "vlc_objects.h"
 #endif
 

include/vlc_common.h

@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.3 2002/06/01 18:04:48 sam Exp $
+ * $Id: vlc_common.h,v 1.4 2002/06/02 13:38:03 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -180,13 +180,22 @@ VLC_DECLARE_STRUCT(bit_stream)
 VLC_DECLARE_STRUCT(network_socket)
 VLC_DECLARE_STRUCT(iso639_lang)
 
+/*****************************************************************************
+ * Plug-in stuff
+ *****************************************************************************/
+#ifndef __PLUGIN__
+#   define VLC_EXPORT( type, name, args ) type name args;
+#else
+#   define VLC_EXPORT( type, name, args ) ;
+    extern module_symbols_t* p_symbols;
+#endif
+
 /*****************************************************************************
  * OS-specific headers and thread types
  *****************************************************************************/
 #if defined( WIN32 )
 #   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
-    typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT)( HANDLE, HANDLE, DWORD, BOOL );
 #endif
 
 #include "vlc_threads.h"
@@ -540,12 +549,4 @@ typedef __int64 off_t;
 /*****************************************************************************
  * Plug-in stuff
  *****************************************************************************/
-#ifndef __PLUGIN__
-#   define VLC_EXPORT( type, name, args ) type name args;
-#else
-#   define VLC_EXPORT( type, name, args ) ;
-    extern module_symbols_t* p_symbols;
-#endif
-
 #include "vlc_symbols.h"
-