Commit cf2f0f1e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Another bunch of invalid config.h usage

parent 9e946839
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
#ifndef _VLC_CODECS_H #ifndef _VLC_CODECS_H
#define _VLC_CODECS_H 1 #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 */ /* Structures exported to the demuxers and decoders */
#if !(defined _GUID_DEFINED || defined GUID_DEFINED) #if !(defined _GUID_DEFINED || defined GUID_DEFINED)
......
...@@ -515,13 +515,6 @@ __vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ), ...@@ -515,13 +515,6 @@ __vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ),
/***************************************************************************** /*****************************************************************************
* Macros and inline functions * 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 */ /* CEIL: division with round to nearest greater integer */
#define CEIL(n, d) ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) ) #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 ) ...@@ -698,10 +691,6 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
# define ATTR_ALIGN(align) # define ATTR_ALIGN(align)
#endif #endif
#ifdef HAVE_ATTRIBUTE_PACKED
# define ATTR_PACKED __attribute__((__packed__))
#endif
/* */ /* */
#define VLC_UNUSED(x) (void)(x) #define VLC_UNUSED(x) (void)(x)
......
...@@ -148,11 +148,7 @@ ...@@ -148,11 +148,7 @@
/* Video heap size - remember that a decompressed picture is big /* Video heap size - remember that a decompressed picture is big
* (~1 Mbyte) before using huge values */ * (~1 Mbyte) before using huge values */
#ifdef OPTIMIZE_MEMORY #define VOUT_MAX_PICTURES 8
# define VOUT_MAX_PICTURES 5
#else
# define VOUT_MAX_PICTURES 8
#endif
/* Minimum number of direct pictures the video output will accept without /* Minimum number of direct pictures the video output will accept without
* creating additional pictures in system memory */ * creating additional pictures in system memory */
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
/* Explanation: /* 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 * #define MODULE_FUNC( zog ) module_foo_zog
* *
* this can't easily be done with the C preprocessor, thus a few ugly hacks. * this can't easily be done with the C preprocessor, thus a few ugly hacks.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment