diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /include/xine/xineutils.h | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'include/xine/xineutils.h')
| -rw-r--r-- | include/xine/xineutils.h | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h index a01f507f9..0ab6fdc07 100644 --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -33,32 +33,20 @@ extern "C" { #include <stdarg.h> #include <pthread.h> -#ifdef XINE_COMPILE -# include <inttypes.h> -# include "attributes.h" -# include "compat.h" -# include "xmlparser.h" -# include "xine_buffer.h" -# include "configfile.h" -# include "list.h" -# include "array.h" -# include "sorted_array.h" +#ifdef WIN32 +# include <winsock.h> #else -# ifdef WIN32 -# include <winsock.h> -# else -# include <sys/time.h> -# endif -# include <xine/os_types.h> -# include <xine/attributes.h> -# include <xine/compat.h> -# include <xine/xmlparser.h> -# include <xine/xine_buffer.h> -# include <xine/configfile.h> -# include <xine/list.h> -# include <xine/array.h> -# include <xine/sorted_array.h> +# include <sys/time.h> #endif +#include <xine/os_types.h> +#include <xine/attributes.h> +#include <xine/compat.h> +#include <xine/xmlparser.h> +#include <xine/xine_buffer.h> +#include <xine/configfile.h> +#include <xine/list.h> +#include <xine/array.h> +#include <xine/sorted_array.h> #include <stdio.h> #include <string.h> |