[vlc-devel] commit: Another bunch of invalid config.h usage ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon May 26 19:39:13 2008 +0300| [cf2f0f1e65282ec8b61a75bd3155461789165665]

Another bunch of invalid config.h usage

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cf2f0f1e65282ec8b61a75bd3155461789165665
---

 include/vlc_codecs.h |    6 ++++++
 include/vlc_common.h |   11 -----------
 include/vlc_config.h |    6 +-----
 include/vlc_plugin.h |    2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index ea421ed..5064ca4 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -28,6 +28,12 @@
 #ifndef _VLC_CODECS_H
 #define _VLC_CODECS_H 1
 
+#ifdef HAVE_ATTRIBUTE_PACKED
+#   define ATTR_PACKED __attribute__((__packed__))
+#else
+#   error FIXME
+#endif
+
 /* Structures exported to the demuxers and decoders */
 
 #if !(defined _GUID_DEFINED || defined GUID_DEFINED)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index a3fcd43..a110852 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -515,13 +515,6 @@ __vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ),
 /*****************************************************************************
  * Macros and inline functions
  *****************************************************************************/
-#ifdef NTOHL_IN_SYS_PARAM_H
-#   include <sys/param.h>
-
-#elif !defined(WIN32) && !defined( UNDER_CE )
-#   include <netinet/in.h>
-
-#endif /* NTOHL_IN_SYS_PARAM_H || WIN32 */
 
 /* CEIL: division with round to nearest greater integer */
 #define CEIL(n, d)  ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) )
@@ -698,10 +691,6 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
 #   define ATTR_ALIGN(align)
 #endif
 
-#ifdef HAVE_ATTRIBUTE_PACKED
-#   define ATTR_PACKED __attribute__((__packed__))
-#endif
-
 /* */
 #define VLC_UNUSED(x) (void)(x)
 
diff --git a/include/vlc_config.h b/include/vlc_config.h
index 81eb4d0..bd8d250 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -148,11 +148,7 @@
 
 /* Video heap size - remember that a decompressed picture is big
  * (~1 Mbyte) before using huge values */
-#ifdef OPTIMIZE_MEMORY
-#   define VOUT_MAX_PICTURES               5
-#else
-#   define VOUT_MAX_PICTURES               8
-#endif
+#define VOUT_MAX_PICTURES               8
 
 /* Minimum number of direct pictures the video output will accept without
  * creating additional pictures in system memory */
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 7ee7f08..cf632ee 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -43,7 +43,7 @@
 
 /* Explanation:
  *
- * if HAVE_DYNAMIC_PLUGINS is NOT set, we will need:
+ * if linking a module statically, we will need:
  * #define MODULE_FUNC( zog ) module_foo_zog
  *
  * this can't easily be done with the C preprocessor, thus a few ugly hacks.