Support for cancelling self and use normal thread variable

[vlc] / include / vlc_config_cat.h

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index f1f0289fae503936b17e96f97120e6a7f454ccff..9696abc95b9966049fb4cb96f7e5bfd8617b19ed 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -22,12 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
-#ifndef _VLC_HELP_H
-#define _VLC_HELP_H 1
+#ifndef VLC_HELP_H
+#define VLC_HELP_H 1
 
 /*
  *  First, we need help strings for the General Settings and for the
@@ -239,12 +235,13 @@
 #define UNKNOWN_HELP N_("There is no help available for these modules.")
 
 /* This function is deprecated and is kept only for compatibility */
-static inline char * GetCapabilityHelp( char *psz_capability, int i_type)
+static inline const char * GetCapabilityHelp( char *psz_capability, int i_type)
 {
+    (void)psz_capability; (void)i_type;
     return " ";
 }
 
-static struct config_category_t categories_array[] =
+static const struct config_category_t categories_array[] =
 {
     /* Interface */
     { CAT_INTERFACE, INTF_TITLE, INTF_HELP },