Remove __LIBVLC__ checks from src/

src/audio_output/aout_internal.h

@@ -21,12 +21,8 @@
  * 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
+#ifndef LIBVLC_AOUT_INTERNAL_H
+# define LIBVLC_AOUT_INTERNAL_H 1
 
 aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds,
         aout_buffer_t *old_buffer);
@@ -267,4 +263,4 @@ static inline void AoutInputsMarkToRestart( aout_instance_t *p_aout )
     aout_unlock_mixer( p_aout );
 }
 
-#endif /* !__LIBVLC_AOUT_INTERNAL_H */
+#endif /* !LIBVLC_AOUT_INTERNAL_H */

src/config/configuration.h

@@ -18,10 +18,6 @@
  * 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
 # define LIBVLC_CONFIGURATION_H 1
 

src/input/access.h

@@ -22,12 +22,8 @@
  * 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_ACCESS_H
-#define _INPUT_ACCESS_H 1
+#ifndef LIBVLC_INPUT_ACCESS_H
+#define LIBVLC_INPUT_ACCESS_H 1
 
 #include <vlc_common.h>
 #include <vlc_access.h>

src/input/clock.h

@@ -22,12 +22,8 @@
  * 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_CLOCK_H
-#define _INPUT_CLOCK_H 1
+#ifndef LIBVLC_INPUT_CLOCK_H
+#define LIBVLC_INPUT_CLOCK_H 1
 
 #include <vlc_common.h>
 #include <vlc_input.h> /* FIXME Needed for input_clock_t */
@@ -139,4 +135,3 @@ void input_clock_SetJitter( input_clock_t *,
 mtime_t input_clock_GetJitter( input_clock_t * );
 
 #endif
-

src/input/decoder.h

@@ -22,12 +22,8 @@
  * 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_DECODER_H
-#define _INPUT_DECODER_H 1
+#ifndef LIBVLC_INPUT_DECODER_H
+#define LIBVLC_INPUT_DECODER_H 1
 
 #include <vlc_common.h>
 #include <vlc_codec.h>

src/input/demux.h

@@ -22,12 +22,8 @@
  * 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_DEMUX_H
-#define _INPUT_DEMUX_H 1
+#ifndef LIBVLC_INPUT_DEMUX_H
+#define LIBVLC_INPUT_DEMUX_H 1
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
@@ -63,4 +59,3 @@ static inline int demux_Control( demux_t *p_demux, int i_query, ... )
 }
 
 #endif
-

src/input/es_out.h

@@ -22,12 +22,8 @@
  * 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_ES_OUT_H
-#define _INPUT_ES_OUT_H 1
+#ifndef LIBVLC_INPUT_ES_OUT_H
+#define LIBVLC_INPUT_ES_OUT_H 1
 
 #include <vlc_common.h>
 

src/input/es_out_timeshift.h

@@ -21,12 +21,8 @@
  * 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_ES_OUT_TIMESHIFT_H
-#define _INPUT_ES_OUT_TIMESHIFT_H 1
+#ifndef LIBVLC_INPUT_ES_OUT_TIMESHIFT_H
+#define LIBVLC_INPUT_ES_OUT_TIMESHIFT_H 1
 
 #include <vlc_common.h>
 

src/input/event.h

@@ -21,12 +21,8 @@
  * 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_EVENT_H
-#define _INPUT_EVENT_H 1
+#ifndef LIBVLC_INPUT_EVENT_H
+#define LIBVLC_INPUT_EVENT_H 1
 
 #include <vlc_common.h>
 
@@ -83,6 +79,4 @@ void input_SendEventAout( input_thread_t *p_input );
  *****************************************************************************/
 void input_SendEventBookmark( input_thread_t *p_input );
 
-
 #endif
-

src/input/info.h

@@ -21,12 +21,8 @@
  * 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_INFO_H
-#define _INPUT_INFO_H 1
+#ifndef LIBVLC_INPUT_INFO_H
+#define LIBVLC_INPUT_INFO_H 1
 
 #include "vlc_input_item.h"
 

src/input/input_interface.h

@@ -21,12 +21,8 @@
  * 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_INTERFACE_H
-#define _INPUT_INTERFACE_H 1
+#ifndef LIBVLC_INPUT_INTERFACE_H
+#define LIBVLC_INPUT_INTERFACE_H 1
 
 #include <vlc_input.h>
 #include <libvlc.h>

src/input/input_internal.h

@@ -21,12 +21,8 @@
  * 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
-#define _INPUT_INTERNAL_H 1
+#ifndef LIBVLC_INPUT_INTERNAL_H
+#define LIBVLC_INPUT_INTERNAL_H 1
 
 #include <vlc_access.h>
 #include <vlc_demux.h>

src/input/item.h

@@ -21,12 +21,8 @@
  * 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_ITEM_H
-#define _INPUT_ITEM_H 1
+#ifndef LIBVLC_INPUT_ITEM_H
+#define LIBVLC_INPUT_ITEM_H 1
 
 #include "input_interface.h"
 

src/input/resource.h

@@ -21,12 +21,8 @@
  * 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_RESOURCE_H
-#define _INPUT_RESOURCE_H 1
+#ifndef LIBVLC_INPUT_RESOURCE_H
+#define LIBVLC_INPUT_RESOURCE_H 1
 
 #include <vlc_common.h>
 
@@ -82,4 +78,3 @@ void input_resource_Terminate( input_resource_t * );
 input_resource_t *input_resource_Hold( input_resource_t * );
 
 #endif
-

src/input/stream.h

@@ -22,12 +22,8 @@
  * 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_STREAM_H
-#define _INPUT_STREAM_H 1
+#ifndef LIBVLC_INPUT_STREAM_H
+#define LIBVLC_INPUT_STREAM_H 1
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
@@ -78,4 +74,3 @@ stream_t *stream_FilterChainNew( stream_t *p_source,
                                  const char *psz_chain,
                                  bool b_record );
 #endif
-

src/input/vlm_event.h

@@ -21,12 +21,8 @@
  * 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_EVENT_H
-#define _VLM_EVENT_H 1
+#ifndef LIBVLC_VLM_EVENT_H
+#define LIBVLC_VLM_EVENT_H 1
 
 #include <vlc_common.h>
 
@@ -42,4 +38,3 @@ void vlm_SendEventMediaInstanceStopped( vlm_t *, int64_t id, const char *psz_nam
 void vlm_SendEventMediaInstanceState( vlm_t *, int64_t id, const char *psz_name, const char *psz_instance_name, input_state_e state );
 
 #endif
-

src/input/vlm_internal.h

@@ -21,12 +21,8 @@
  * 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
-#define _VLM_INTERNAL_H 1
+#ifndef LIBVLC_VLM_INTERNAL_H
+#define LIBVLC_VLM_INTERNAL_H 1
 
 #include <vlc_vlm.h>
 #include "input_interface.h"

src/misc/media_library.c

@@ -21,10 +21,6 @@
  * 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
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

src/misc/sql.c

@@ -21,10 +21,6 @@
  * 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
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

src/misc/variables.h

@@ -21,10 +21,6 @@
  * 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
 

src/modules/modules.h

@@ -21,10 +21,6 @@
  * 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
 

src/stream_output/stream_output.h

@@ -24,10 +24,6 @@
  * 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
 # define VLC_SRC_STREAMOUT_H 1
 

src/video_output/chrono.h

@@ -21,12 +21,8 @@
  * 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 _VOUT_CHRONO_H
-#define _VOUT_CHRONO_H
+#ifndef LIBVLC_VOUT_CHRONO_H
+#define LIBVLC_VOUT_CHRONO_H
 
 typedef struct {
     int     shift;

src/video_output/control.h

@@ -21,12 +21,8 @@
  * 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 _VOUT_INTERNAL_CONTROL_H
-#define _VOUT_INTERNAL_CONTROL_H
+#ifndef LIBVLC_VOUT_INTERNAL_CONTROL_H
+#define LIBVLC_VOUT_INTERNAL_CONTROL_H
 
 /* */
 enum {
@@ -138,4 +134,3 @@ int vout_control_Pop(vout_control_t *, vout_control_cmd_t *, mtime_t deadline, m
 void vout_control_Dead(vout_control_t *);
 
 #endif
-

src/video_output/display.h

@@ -21,10 +21,6 @@
  * 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
-
 #include <vlc_vout_wrapper.h>
 
 #if 0
@@ -121,4 +117,3 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
 void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *);
 vout_window_t *vout_NewDisplayWindow(vout_thread_t *, vout_display_t *, const vout_window_cfg_t *);
 void vout_DeleteDisplayWindow(vout_thread_t *, vout_display_t *, vout_window_t *);
-

src/video_output/event.h

@@ -21,10 +21,6 @@
  * 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
-
 #include <vlc_common.h>
 #include <vlc_playlist.h>
 #include <math.h>

src/video_output/interlacing.h

@@ -21,12 +21,8 @@
  * 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 _VOUT_INTERLACING_H
-#define _VOUT_INTERLACING_H
+#ifndef LIBVLC_VOUT_INTERLACING_H
+#define LIBVLC_VOUT_INTERLACING_H
 
 typedef struct {
     bool    is_interlaced;

src/video_output/postprocessing.h

@@ -21,12 +21,8 @@
  * 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 _VOUT_POSTPROCESSING_H
-#define _VOUT_POSTPROCESSING_H
+#ifndef LIBVLC_VOUT_POSTPROCESSING_H
+#define LIBVLC_VOUT_POSTPROCESSING_H
 
 typedef struct {
     int qtype;

src/video_output/snapshot.h

@@ -21,12 +21,8 @@
  * 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 _VOUT_INTERNAL_SNAPSHOT_H
-#define _VOUT_INTERNAL_SNAPSHOT_H
+#ifndef LIBVLC_VOUT_INTERNAL_SNAPSHOT_H
+#define LIBVLC_VOUT_INTERNAL_SNAPSHOT_H
 
 #include <vlc_picture.h>
 
@@ -85,4 +81,3 @@ int vout_snapshot_SaveImage(char **name, int *sequential,
                             const vout_snapshot_save_cfg_t *cfg);
 
 #endif
-

src/video_output/statistic.h

@@ -21,12 +21,8 @@
  * 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 _VOUT_STATISTIC_H
-#define _VOUT_STATISTIC_H
+#ifndef LIBVLC_VOUT_STATISTIC_H
+#define LIBVLC_VOUT_STATISTIC_H
 
 typedef struct {
     vlc_spinlock_t spin;
@@ -62,4 +58,3 @@ static inline void vout_statistic_Update(vout_statistic_t *stat, int displayed,
 }
 
 #endif
-

src/video_output/vout_control.h

@@ -22,13 +22,8 @@
  * 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 _VOUT_CONTROL_H
-#define _VOUT_CONTROL_H 1
+#ifndef LIBVLC_VOUT_CONTROL_H
+#define LIBVLC_VOUT_CONTROL_H 1
 
 /**
  * This function will (un)pause the display of pictures.
@@ -81,4 +76,3 @@ void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title );
 bool vout_IsEmpty( vout_thread_t *p_vout );
 
 #endif
-

src/video_output/vout_internal.h

@@ -22,13 +22,8 @@
  * 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 _VOUT_INTERNAL_H
-#define _VOUT_INTERNAL_H 1
+#ifndef LIBVLC_VOUT_INTERNAL_H
+#define LIBVLC_VOUT_INTERNAL_H 1
 
 #include <vlc_picture_fifo.h>
 #include <vlc_picture_pool.h>
@@ -172,4 +167,3 @@ void spu_Attach( spu_t *, vlc_object_t *input, bool );
 void spu_ChangeMargin(spu_t *, int);
 
 #endif
-