Commit 62ffefd4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Protects internal headers against incorrect/multiple inclusions

parent 6dd8082f
...@@ -21,6 +21,13 @@ ...@@ -21,6 +21,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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_AOUT_INTERNAL_H
# define __LIBVLC_AOUT_INTERNAL_H 1
#if defined( __APPLE__ ) || defined( SYS_BSD ) #if defined( __APPLE__ ) || defined( SYS_BSD )
#undef HAVE_ALLOCA #undef HAVE_ALLOCA
#endif #endif
...@@ -131,3 +138,4 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t *, aout_input_t *, size_t ); ...@@ -131,3 +138,4 @@ aout_buffer_t * aout_DecNewBuffer( aout_instance_t *, aout_input_t *, size_t );
void aout_DecDeleteBuffer( aout_instance_t *, aout_input_t *, aout_buffer_t * ); void aout_DecDeleteBuffer( aout_instance_t *, aout_input_t *, aout_buffer_t * );
int aout_DecPlay( aout_instance_t *, aout_input_t *, aout_buffer_t *, int i_input_rate ); int aout_DecPlay( aout_instance_t *, aout_input_t *, aout_buffer_t *, int i_input_rate );
#endif /* !__LIBVLC_AOUT_INTERNAL_H */
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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 _INPUT_INTERNAL_H #ifndef _INPUT_INTERNAL_H
#define _INPUT_INTERNAL_H 1 #define _INPUT_INTERNAL_H 1
...@@ -357,9 +361,6 @@ static inline int demux2_Control( demux_t *p_demux, int i_query, ... ) ...@@ -357,9 +361,6 @@ static inline int demux2_Control( demux_t *p_demux, int i_query, ... )
return i_result; return i_result;
} }
#if defined(__PLUGIN__) || defined(__BUILTIN__)
# warning This is an internal header, something is wrong if you see this message.
#else
/* Stream */ /* Stream */
/** /**
* stream_t definition * stream_t definition
...@@ -389,6 +390,5 @@ static inline stream_t *vlc_stream_create( vlc_object_t *obj ) ...@@ -389,6 +390,5 @@ static inline stream_t *vlc_stream_create( vlc_object_t *obj )
return (stream_t *)vlc_custom_create( obj, sizeof(stream_t), return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
VLC_OBJECT_STREAM, "stream" ); VLC_OBJECT_STREAM, "stream" );
} }
#endif
#endif #endif
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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 _VLM_INTERNAL_H #ifndef _VLM_INTERNAL_H
#define _VLM_INTERNAL_H 1 #define _VLM_INTERNAL_H 1
......
...@@ -23,9 +23,17 @@ ...@@ -23,9 +23,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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_INTERFACE_H
# define __LIBVLC_INTERFACE_H 1
/********************************************************************** /**********************************************************************
* Interaction * Interaction
**********************************************************************/ **********************************************************************/
void intf_InteractionManage( playlist_t *); void intf_InteractionManage( playlist_t *);
void intf_InteractionDestroy( interaction_t *); void intf_InteractionDestroy( interaction_t *);
#endif
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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; typedef struct callback_entry_t callback_entry_t;
...@@ -69,4 +75,4 @@ struct variable_t ...@@ -69,4 +75,4 @@ struct variable_t
/** Array of registered callbacks */ /** Array of registered callbacks */
callback_entry_t * p_entries; callback_entry_t * p_entries;
}; };
#endif
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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_CONFIGURATION_H #ifndef LIBVLC_CONFIGURATION_H
# define LIBVLC_CONFIGURATION_H 1 # define LIBVLC_CONFIGURATION_H 1
......
...@@ -21,6 +21,14 @@ ...@@ -21,6 +21,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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_MODULES_H
# define __LIBVLC_MODULES_H 1
/* Number of tries before we unload an unused module */ /* Number of tries before we unload an unused module */
#define MODULE_HIDE_DELAY 50 #define MODULE_HIDE_DELAY 50
...@@ -152,3 +160,5 @@ void __module_LoadPlugins ( vlc_object_t * ); ...@@ -152,3 +160,5 @@ void __module_LoadPlugins ( vlc_object_t * );
void __module_EndBank ( vlc_object_t * ); void __module_EndBank ( vlc_object_t * );
#define module_ResetBank(a) __module_ResetBank(VLC_OBJECT(a)) #define module_ResetBank(a) __module_ResetBank(VLC_OBJECT(a))
void __module_ResetBank ( vlc_object_t * ); void __module_ResetBank ( vlc_object_t * );
#endif /* !__LIBVLC_MODULES_H */
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef __LIBVLC_PLAYLIST_INTERNAL_H
# define __LIBVLC_PLAYLIST_INTERNAL_H 1
/** /**
* \file * \file
* This file contain internal structures and function prototypes related * This file contain internal structures and function prototypes related
...@@ -130,3 +133,4 @@ int playlist_ItemDelete ( playlist_item_t * ); ...@@ -130,3 +133,4 @@ int playlist_ItemDelete ( playlist_item_t * );
#endif #endif
#define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null" #define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null"
#endif /* !__LIBVLC_PLAYLIST_INTERNAL_H */
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 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 VLC_SRC_STREAMOUT_H #ifndef VLC_SRC_STREAMOUT_H
# define VLC_SRC_STREAMOUT_H 1 # define VLC_SRC_STREAMOUT_H 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment