Include assert.h when needed

include/vlc_common.h

@@ -53,7 +53,6 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <stdarg.h>
-#include <assert.h>
 
 #include <string.h>
 #include <stdio.h>
@@ -599,6 +598,8 @@ struct gc_object_t
             VLC_GC_MEMBERS
 };
 
+#include <assert.h> /* FIXME: should not be included here */
+
 static inline void __vlc_gc_incref( gc_object_t * p_gc )
 {
     assert( p_gc->i_gc_refcount > 0 );

include/vlc_services_discovery.h

@@ -36,11 +36,8 @@ extern "C" {
  * @{
  */
 
-#include <assert.h>
 #include <vlc_input.h>
 #include <vlc_events.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 struct services_discovery_t
 {

src/config/core.c

@@ -31,10 +31,8 @@
 #include "vlc_charset.h"
 
 #include <errno.h>                                                  /* errno */
-
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#endif
+#include <assert.h>
+#include <limits.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>                                          /* getuid() */

src/config/file.c

@@ -32,6 +32,7 @@
 
 #include <errno.h>                                                  /* errno */
 #include <stdbool.h>
+#include <assert.h>
 
 #ifdef HAVE_LIMITS_H
 #   include <limits.h>

src/config/intf.c

@@ -31,10 +31,8 @@
 #include "vlc_charset.h"
 
 #include <errno.h>                                                  /* errno */
-
-#ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#endif
+#include <assert.h>
+#include <limits.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>                                          /* getuid() */

src/input/decoder.c

@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <assert.h>
 
 #include <vlc/vlc.h>
 

src/input/input.c

@@ -33,6 +33,7 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <assert.h>
 
 #include "input_internal.h"
 

src/input/item.c

@@ -24,6 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <assert.h>
 
 #include <vlc/vlc.h>
 #include "vlc_playlist.h"

src/input/meta.c

@@ -36,6 +36,7 @@
 #include "../playlist/playlist_internal.h"
 #include <errno.h>
 #include <limits.h>                                             /* PATH_MAX */
+#include <assert.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>

src/misc/objects.c

@@ -70,6 +70,7 @@
 # include <fcntl.h>
 # include <errno.h> /* ENOSYS */
 #endif
+#include <assert.h>
 
 /*****************************************************************************
  * Local prototypes

src/modules/modules.c

@@ -40,6 +40,7 @@
 #include <stdlib.h>                                      /* free(), strtol() */
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>                                              /* strdup() */
+#include <assert.h>
 
 #ifdef HAVE_DIRENT_H
 #   include <dirent.h>

src/network/tcp.c

@@ -33,6 +33,7 @@
 #include <vlc/vlc.h>
 
 #include <errno.h>
+#include <assert.h>
 
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>

src/playlist/search.c

@@ -23,6 +23,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <assert.h>
 
 #include <vlc/vlc.h>
 #include "vlc_playlist.h"

src/playlist/services_discovery.c

@@ -23,6 +23,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <assert.h>
 
 #include <vlc/vlc.h>
 #include "vlc_playlist.h"

src/stream_output/sap.c

@@ -36,6 +36,7 @@
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>
 #include <ctype.h>                                  /* tolower(), isxdigit() */
+#include <assert.h>
 
 #include <vlc_sout.h>
 #include <vlc_network.h>