gnutls: replace deprecated types

[vlc] / modules / media_library / sql_media_library.h

diff --git a/modules/media_library/sql_media_library.h b/modules/media_library/sql_media_library.h
index 312eee80462bc161a125645ae15de78a5be6adb9..705c0a02a384a55d8075f7a20432f87f34994f1b 100644 (file)
--- a/modules/media_library/sql_media_library.h
+++ b/modules/media_library/sql_media_library.h
@@ -28,17 +28,14 @@
 #ifndef SQL_MEDIA_LIBRARY_H
 #define SQL_MEDIA_LIBRARY_H
 
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <stdarg.h>
+#include <assert.h>
+#include <errno.h>
+#include <sys/stat.h>
 
 #include <vlc_common.h>
-#include <vlc/vlc.h>
-
 #include <vlc_sql.h>
 #include <vlc_media_library.h>
-
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_arrays.h>
@@ -47,17 +44,8 @@
 #include <vlc_interface.h>
 #include <vlc_modules.h>
 
-#include <stdarg.h>
-#include <assert.h>
-#include <errno.h>
-
 #include "item_list.h"
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
-
 /*****************************************************************************
  * Static parameters
  *****************************************************************************/
@@ -118,8 +106,8 @@ struct monitoring_thread_t
 /* Media status Watching thread */
 struct watch_thread_t
 {
-    VLC_COMMON_MEMBERS;
     media_library_t *p_ml;
+    vlc_thread_t thread;
     vlc_cond_t cond;
     vlc_mutex_t lock;