[vlc-commits] [Git][videolan/vlc][master] 2 commits: src: avoid config.h include in header

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
940c0739 by Johannes Kauffmann at 2023-07-11T07:43:49+00:00
src: avoid config.h include in header

- - - - -
17ada6c5 by Johannes Kauffmann at 2023-07-11T07:43:49+00:00
lib: avoid including config.h in headers

... and add it back where it was missing in a source file.

Also regroup the includes in libvlc_internal.h somewhat.

- - - - -


6 changed files:

- lib/error.c
- lib/libvlc_internal.h
- lib/media_list_internal.h
- lib/media_player_internal.h
- lib/renderer_discoverer_internal.h
- src/config/ansi_term.h


Changes:

=====================================
lib/error.c
=====================================
@@ -18,6 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "libvlc_internal.h"
 
 #include <stdarg.h>


=====================================
lib/libvlc_internal.h
=====================================
@@ -24,17 +24,13 @@
 #ifndef _LIBVLC_INTERNAL_H
 #define _LIBVLC_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_dialog.h>
 #include <vlc/libvlc_picture.h>
 #include <vlc/libvlc_media.h>
 #include <vlc/libvlc_events.h>
-#include <vlc_atomic.h>
 
+#include <vlc_atomic.h>
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 #include <vlc_threads.h>


=====================================
lib/media_list_internal.h
=====================================
@@ -24,10 +24,6 @@
 #ifndef _LIBVLC_MEDIA_LIST_INTERNAL_H
 #define _LIBVLC_MEDIA_LIST_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc/vlc.h>
 #include <vlc/libvlc_media.h>
 


=====================================
lib/media_player_internal.h
=====================================
@@ -24,10 +24,6 @@
 #ifndef _LIBVLC_MEDIA_PLAYER_INTERNAL_H
 #define _LIBVLC_MEDIA_PLAYER_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc/vlc.h>
 #include <vlc/libvlc_media.h>
 #include <vlc_input.h>


=====================================
lib/renderer_discoverer_internal.h
=====================================
@@ -21,10 +21,6 @@
 #ifndef _LIBVLC_RENDERER_DISCOVERER_INTERNAL_H
 #define _LIBVLC_RENDERER_DISCOVERER_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_renderer_discovery.h>
 
 vlc_renderer_item_t *


=====================================
src/config/ansi_term.h
=====================================
@@ -21,10 +21,6 @@
 #ifndef VLC_ANSI_TERM_H
 #define VLC_ANSI_TERM_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #if !defined( _WIN32 )
 # include <termios.h>
 # include <sys/ioctl.h>



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9af46e0abda02682e1d96b1a170d232331aef357...17ada6c55fea1289c60475872b9613c4abb173fe

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9af46e0abda02682e1d96b1a170d232331aef357...17ada6c55fea1289c60475872b9613c4abb173fe
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance