Remove __LIBVLC__ checks from src/

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index b4b743704216a5f39d6fd3dfa319c67157ac24b3..e7eae8974bcee3d213d5ce8e6cb1eca592b62c5e 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/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 */

diff --git a/src/config/configuration.h b/src/config/configuration.h
index 012116ca29b094d8f06968819f7023964cdad9fe..eb7fba7a80162a6fae9eb1ad98eda121c66e558a 100644 (file)
--- a/src/config/configuration.h
+++ b/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
 

diff --git a/src/input/access.h b/src/input/access.h
index 0e8739b5eaa5dd790e4777caa16d2323a3ecf1b2..6679a8ede7eae9f8deb3180afb1d8dc1e2bb194e 100644 (file)
--- a/src/input/access.h
+++ b/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>

diff --git a/src/input/clock.h b/src/input/clock.h
index 99c0af557718afb4692359e685d4edf63dd40ce6..81f858c807b62bc43fb6e77347e47db789ff3332 100644 (file)
--- a/src/input/clock.h
+++ b/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
-

diff --git a/src/input/decoder.h b/src/input/decoder.h
index b113d22fcde4bea0370643a223e6eab478564d4d..325b2daa4afd894ba39268b49e2c320a80a8ba24 100644 (file)
--- a/src/input/decoder.h
+++ b/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>

diff --git a/src/input/demux.h b/src/input/demux.h
index 8e9aa27088f644b2409b3b927563206fd698851c..4a3aceba5e79ae3b03466cdf02e360b59f1f8d69 100644 (file)
--- a/src/input/demux.h
+++ b/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
-

diff --git a/src/input/es_out.h b/src/input/es_out.h
index d0b8111929044767c4a52ec1cda91b0d65995221..4f9a7fd79674e58934ad239762c2b45790a498f6 100644 (file)
--- a/src/input/es_out.h
+++ b/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>
 

diff --git a/src/input/es_out_timeshift.h b/src/input/es_out_timeshift.h
index b5eec9753e130f18c21e1b29ce8b97e3e01f4bd2..d554fa7a22d5347d6a9a3aec18503c0f623cb589 100644 (file)
--- a/src/input/es_out_timeshift.h
+++ b/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>
 

diff --git a/src/input/event.h b/src/input/event.h
index 4b56cfeed75698047bab1dee90cb43af610936c8..31eea4d9133213f3622201ca80019bda0256904e 100644 (file)
--- a/src/input/event.h
+++ b/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
-

diff --git a/src/input/info.h b/src/input/info.h
index 2beaafe87d27f0b0a546eeda3c2683d600b55b9a..d36d447b1e993a240b2c7faa57c47e61120ef6b8 100644 (file)
--- a/src/input/info.h
+++ b/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"
 

diff --git a/src/input/input_interface.h b/src/input/input_interface.h
index 1e2e7c8dab514a497bd4ed0542e37cb22503f142..8e8704d4598786230d3744b6473014123ffaed17 100644 (file)
--- a/src/input/input_interface.h
+++ b/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>

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 7cd39f75baa39718df282f163f976a07bcd7b0b5..beaa8568d8b76204e7953be278c596aa9cddea54 100644 (file)
--- a/src/input/input_internal.h
+++ b/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>

diff --git a/src/input/item.h b/src/input/item.h
index ecf78cfc7d53e2efb5c15ad7360a8e0ce019dc36..9b021366f9b59b73ef7e3300c548e79811e5691c 100644 (file)
--- a/src/input/item.h
+++ b/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"
 

diff --git a/src/input/resource.h b/src/input/resource.h
index 713fe8e05499c3110541bc3f0c1a987b3e252261..bcfe962fb62e832dcfd10d832be7550213e39aa2 100644 (file)
--- a/src/input/resource.h
+++ b/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
-

diff --git a/src/input/stream.h b/src/input/stream.h
index eb3dd2f2be069ed4bb7ee112bca2f25c17c1118e..726e43ee2fa7e9d8e3e3b6f9e855f8720fd927da 100644 (file)
--- a/src/input/stream.h
+++ b/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
-

diff --git a/src/input/vlm_event.h b/src/input/vlm_event.h
index 2aa837fbaa061d52c96352090b4647af3a78b0f8..c9203f65ea68aa42c8ecec6b3a91fd637e408f18 100644 (file)
--- a/src/input/vlm_event.h
+++ b/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
-

diff --git a/src/input/vlm_internal.h b/src/input/vlm_internal.h
index 03e58284db722399588c53ae97ea904f5c02372d..f4603caa62878171143499883371cd1aed92b8b6 100644 (file)
--- a/src/input/vlm_internal.h
+++ b/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"

diff --git a/src/misc/media_library.c b/src/misc/media_library.c
index 922b4935f2c5480684beaaad982a375cee7207b2..ef5e8e05c1c41253fce785d08be5e06c351da0fb 100644 (file)
--- a/src/misc/media_library.c
+++ b/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

diff --git a/src/misc/sql.c b/src/misc/sql.c
index 1634ffa4607c907c9ae0349c142b80192a07dc6e..2b81ef7f0392aea447c007ead61f133b5c94ea75 100644 (file)
--- a/src/misc/sql.c
+++ b/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

diff --git a/src/misc/variables.h b/src/misc/variables.h
index b0de92de2d943e2149f58713bfa59d41a9c4022f..50ce21ef918df59b54b1d6da6897f85258cdea2e 100644 (file)
--- a/src/misc/variables.h
+++ b/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
 

diff --git a/src/modules/modules.h b/src/modules/modules.h
index 8be503159dc9c7784f2699da7bcc77309a8f9f1c..bc60ef4ec6ae132f7ea38e0526c380c7d470d350 100644 (file)
--- a/src/modules/modules.h
+++ b/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
 

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 40e5a05bc1df1e85b636d8d252b9a025157ba201..0952966112b821b74ef30fb604f30e1662583f57 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/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
 

diff --git a/src/video_output/chrono.h b/src/video_output/chrono.h
index 1021bd2c8a50d631ce4451353a48da9ee6a87d32..fcbd8e2d22b192f76e3c3976131855b4916f1b76 100644 (file)
--- a/src/video_output/chrono.h
+++ b/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;

diff --git a/src/video_output/control.h b/src/video_output/control.h
index 9510c22ce98aa97aaea41c1b8e78881e42e1b7a3..742613438c2efb5b30b09689e6555031da0b830f 100644 (file)
--- a/src/video_output/control.h
+++ b/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
-

diff --git a/src/video_output/display.h b/src/video_output/display.h
index 2763f40b6170045fdb21189d1406a536cf474d95..eb4ca426bdcbbad8a5c3ad62ae84ab222decd73f 100644 (file)
--- a/src/video_output/display.h
+++ b/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 *);
-

diff --git a/src/video_output/event.h b/src/video_output/event.h
index 0cb1042c556d8a2ee639925774c994e2d800ec4e..6c1415eb472bfae288395327d7d2e66537475db5 100644 (file)
--- a/src/video_output/event.h
+++ b/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>

diff --git a/src/video_output/interlacing.h b/src/video_output/interlacing.h
index bc0b729ea0313b566780431e8c06068438458d69..d755531e40f06519006f737ed460362d71624b78 100644 (file)
--- a/src/video_output/interlacing.h
+++ b/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;

diff --git a/src/video_output/postprocessing.h b/src/video_output/postprocessing.h
index 4521e1a95bdd8e6535a43d0c8b49753f76abb140..2915363015af084c6a67e46246a3d3a09f3e5ec9 100644 (file)
--- a/src/video_output/postprocessing.h
+++ b/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;

diff --git a/src/video_output/snapshot.h b/src/video_output/snapshot.h
index 866937701fb882d1a0a686c15fab3220f49e137d..9dcc8bb9cc8b233f994df68346ad004ea6eee712 100644 (file)
--- a/src/video_output/snapshot.h
+++ b/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
-

diff --git a/src/video_output/statistic.h b/src/video_output/statistic.h
index 68f81f8a83cd244038737b50f6c1b6ea01d68a10..65c34c6410ee17fc53da2d039a6199c8a04b0e88 100644 (file)
--- a/src/video_output/statistic.h
+++ b/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
-

diff --git a/src/video_output/vout_control.h b/src/video_output/vout_control.h
index f2d5c12902d58a4b6e7dd3c378d8b7afd589393f..b419ab052fd37949806cf7793e26a6ffb23212d1 100644 (file)
--- a/src/video_output/vout_control.h
+++ b/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
-

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 9e12b0260b39bfcf139bace99e98f7fa8b793454..db3fa2c8d6fef2e7f746f7db371c565501208593 100644 (file)
--- a/src/video_output/vout_internal.h
+++ b/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
-