Include assert.h when needed

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 356cb1612701cdd92a028419365e63f695eaf012..7719c0fe344eaec8283d5b4dfacedf33f7f73fe3 100644 (file)
--- a/include/vlc_common.h
+++ b/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 );

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index df8b32a9863324c766ba9ec9c570d2366bc3c39f..6a6e6cc445838801fea9578b5d70484b430b009b 100644 (file)
--- a/include/vlc_services_discovery.h
+++ b/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
 {

diff --git a/src/config/core.c b/src/config/core.c
index 43e5b76a4037b30910f7bc64f6ee9aed6ffd4446..e94c16453831ba886cf3025b29547106005aff05 100644 (file)
--- a/src/config/core.c
+++ b/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() */

diff --git a/src/config/file.c b/src/config/file.c
index b41381e625ae1204d95d513210caf8b47b4e537a..3603fb14f3fc53b9a8739c957de7bb0bbf04e3a8 100644 (file)
--- a/src/config/file.c
+++ b/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>

diff --git a/src/config/intf.c b/src/config/intf.c
index 78f15454c25898bd16800e97e6ad01021a7ee79f..a8ae1b68fd91ad767aff0344b3ad63a617370a38 100644 (file)
--- a/src/config/intf.c
+++ b/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() */

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 90c019fb7a3addd0c0b96c5530a74bfd62b9541a..97efa3a66f3591194f11226560e7ce9bb25e476e 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <assert.h>
 
 #include <vlc/vlc.h>
 

diff --git a/src/input/input.c b/src/input/input.c
index a5db26c2313da6e079d16ef2124ffd97e25010ed..dcb7b66dae1d33fa4fed096f13a23f18cec1c3db 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -33,6 +33,7 @@
 
 #include <ctype.h>
 #include <limits.h>
+#include <assert.h>
 
 #include "input_internal.h"
 

diff --git a/src/input/item.c b/src/input/item.c
index 427d8181239fc3f9cc9f9ca9a72e133e7a190f96..fbb16f5f337033d007961ec843eeac7d0fd21dc6 100644 (file)
--- a/src/input/item.c
+++ b/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"

diff --git a/src/input/meta.c b/src/input/meta.c
index 18e5c553d2e171d0cf473b304f696bc066f847d1..3655b6f8e9df858192c4a454b639fc46f1a3d0dc 100644 (file)
--- a/src/input/meta.c
+++ b/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>

diff --git a/src/misc/objects.c b/src/misc/objects.c
index ddf5a3842b6e296eb334db722d82ee77d3512d68..dc2a7bd9abe7ee4f4effd2857f4facaf2f960603 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -70,6 +70,7 @@
 # include <fcntl.h>
 # include <errno.h> /* ENOSYS */
 #endif
+#include <assert.h>
 
 /*****************************************************************************
  * Local prototypes

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 0ef91cad6f04d1bdbdd19b230e3d639f9460300d..92a72a403dc0ae88797586b858c022059d3e5d25 100644 (file)
--- a/src/modules/modules.c
+++ b/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>

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 2f461ae896a72c8e904c4c3aa48c28007a58c678..554065c78dc05085593092ec76318fabd10c9a17 100644 (file)
--- a/src/network/tcp.c
+++ b/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>

diff --git a/src/playlist/search.c b/src/playlist/search.c
index b0482dd45c3f196cc16a630df082a613ed8d46e6..3dbddbbccb9f8c090ddb0d85e4b6830323f2166d 100644 (file)
--- a/src/playlist/search.c
+++ b/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"

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 2498ab7fa300e8ddb6b93eedc637c16cbfe3e88b..e3e787f9aa8683f46bf20c4edb3aaca0ff0c49f4 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/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"

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index e19d3e99d057070db6a0a5843b79d20e9ab7bbc0..9529c5fe4310dd5125fdfe8b18ca2a3a461f3f01 100644 (file)
--- a/src/stream_output/sap.c
+++ b/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>