We don't need the vlc_mutex_lock here.

[vlc] / src / misc / variables.h

diff --git a/src/misc/variables.h b/src/misc/variables.h
index c100e836e81e977492d62f24b48c92d2ee399d2a..96dc450a50ef096227e814f036b0c8b74d3da664 100644 (file)
--- a/src/misc/variables.h
+++ b/src/misc/variables.h
@@ -2,7 +2,7 @@
  * variables.h: object variables typedefs
  *****************************************************************************
  * Copyright (C) 2002-2006 the VideoLAN team
- * $Id: variables.c 22331 2007-09-30 16:58:33Z courmisch $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -21,6 +21,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
+#ifndef __LIBVLC_VARIABLES_H
+# define __LIBVLC_VARIABLES_H 1
 
 typedef struct callback_entry_t callback_entry_t;
 
@@ -62,11 +68,11 @@ struct variable_t
     vlc_list_t   choices_text;
 
     /** Set to TRUE if the variable is in a callback */
-    vlc_bool_t   b_incallback;
+    bool   b_incallback;
 
     /** Number of registered callbacks */
     int                i_entries;
     /** Array of registered callbacks */
     callback_entry_t * p_entries;
 };
-
+#endif