From 1b09c02c7e8162abb14d6f30980b09c7d7b34200 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Thu, 24 Jan 2008 16:08:13 +0000
Subject: [PATCH] Include assert.h when needed

---
 include/vlc_common.h              | 3 ++-
 include/vlc_services_discovery.h  | 3 ---
 src/config/core.c                 | 6 ++----
 src/config/file.c                 | 1 +
 src/config/intf.c                 | 6 ++----
 src/input/decoder.c               | 1 +
 src/input/input.c                 | 1 +
 src/input/item.c                  | 1 +
 src/input/meta.c                  | 1 +
 src/misc/objects.c                | 1 +
 src/modules/modules.c             | 1 +
 src/network/tcp.c                 | 1 +
 src/playlist/search.c             | 1 +
 src/playlist/services_discovery.c | 1 +
 src/stream_output/sap.c           | 1 +
 15 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 356cb16127..7719c0fe34 100644
--- 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 df8b32a986..6a6e6cc445 100644
--- 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 43e5b76a40..e94c164538 100644
--- 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 b41381e625..3603fb14f3 100644
--- 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 78f15454c2..a8ae1b68fd 100644
--- 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 90c019fb7a..97efa3a66f 100644
--- 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 a5db26c231..dcb7b66dae 100644
--- 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 427d818123..fbb16f5f33 100644
--- 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 18e5c553d2..3655b6f8e9 100644
--- 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 ddf5a3842b..dc2a7bd9ab 100644
--- 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 0ef91cad6f..92a72a403d 100644
--- 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 2f461ae896..554065c78d 100644
--- 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 b0482dd45c..3dbddbbccb 100644
--- 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 2498ab7fa3..e3e787f9aa 100644
--- 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 e19d3e99d0..9529c5fe43 100644
--- 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>
-- 
2.39.2