diff options
Diffstat (limited to 'win32/include')
| -rw-r--r-- | win32/include/Makefile.am | 24 | ||||
| -rw-r--r-- | win32/include/msvc/config.h | 113 | ||||
| -rw-r--r-- | win32/include/msvc/sys/time.h (renamed from win32/include/sys/time.h) | 0 | ||||
| -rw-r--r-- | win32/include/unistd.h | 16 | ||||
| -rwxr-xr-x | win32/include/xinesuppt.h | 20 |
5 files changed, 93 insertions, 80 deletions
diff --git a/win32/include/Makefile.am b/win32/include/Makefile.am new file mode 100644 index 000000000..1b13e092b --- /dev/null +++ b/win32/include/Makefile.am @@ -0,0 +1,24 @@ +include $(top_srcdir)/misc/Makefile.common + +msvc_headers = \ + msvc/inttypes.h \ + msvc/stdint.h \ + msvc/sys/time.h + +if WIN32 + install_h = $(msvc_headers) +else + dist_h = $(msvc_headers) +endif + +EXTRA_DIST = $(dist_h) \ + sys/socket.h \ + msvc/config.h \ + netinet/in.h \ + sys/socket.h \ + dlfcn.h \ + netdb.h \ + pwd.h \ + unistd.h + +nobase_include_HEADERS = $(install_h) diff --git a/win32/include/msvc/config.h b/win32/include/msvc/config.h index 886cf4762..2b44ff85c 100644 --- a/win32/include/msvc/config.h +++ b/win32/include/msvc/config.h @@ -1,34 +1,26 @@ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Adjusting for MSVS: +/* Adjusting for MSVC from MinGW: * NLS disabled * x86 disabled * inline defined to __inline * HAVE_SYS_PARAM_H disabled - * XINE_PLUGINDIR - * XINE_FONTDIR - * XINE_LOCALEDIR * HAVE_DLFCN_H 1 - * HAVE_SETENV 1 (FIXME: into utils.c) - * define ssize_t as __int64 + * HAVE_ERRNO_H 1 + * HAVE_FCNTL_H 1 + * HAVE_ISOC99_PRAGMA 1 + * HAVE_MEMCPY 1 + * HAVE_STDBOOL_H + * HAVE_STDIO_H 1 + * HAVE_VSNPRINTF 1 + * HAVE_WIN32_CDROM 1 + * X_DISPLAY_MISSING 1 + * HAVE_MEMCPY 1 + * Disable: + * esd, arts, alsa, gnome_vfs, png, sdl, speex, x11, theora */ -#if defined(WIN32) - -#include <windows.h> -#include <stdio.h> -#include <string.h> - -#define ssize_t __int64 - -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif - -#endif - - #ifdef inline /* the strange formatting below is needed to prevent config.status from rewriting it */ @@ -40,8 +32,11 @@ /* Define this if you're running PowerPC architecture */ /* #undef ARCH_PPC */ +/* Define this if you're running SPARC architecture */ +/* #undef ARCH_SPARC */ + /* Define this if you're running x86 architecture */ -/* #define ARCH_X86 */ +/* #undef ARCH_X86 */ /* Define this if you're running x86 architecture */ /* #undef ARCH_X86_64 */ @@ -50,7 +45,7 @@ #define ATTRIBUTE_ALIGNED_MAX 64 /* compiler does lsbf in struct bitfields */ -#define BITFIELD_LSBF +/* #undef BITFIELD_LSBF */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. @@ -64,19 +59,19 @@ /* #undef C_ALLOCA */ /* what to put between the brackets for empty arrays */ -#define EMPTY_ARRAY_SIZE +/* #undef EMPTY_ARRAY_SIZE */ /* Define this if you have a Motorola 74xx CPU */ /* #undef ENABLE_ALTIVEC */ /* Define to 1 if translation of program messages to the user's native language is requested. */ -/* #define ENABLE_NLS 1 */ +/* #undef ENABLE_NLS */ /* Define this if you have Sun UltraSPARC CPU */ /* #undef ENABLE_VIS */ -/* Define to select libmad fixed pointarithmetic implementation */ +/* Define to select libmad fixed point arithmetic implementation */ /* #undef FPM_64BIT */ /* Define to select libmad fixed point arithmetic implementation */ @@ -119,6 +114,9 @@ /* Define this if you have ARTS (libartsc) installed */ /* #undef HAVE_ARTS */ +/* Define to 1 if you have the <avcodec.h> header file. */ +/* #undef HAVE_AVCODEC_H */ + /* Define to 1 if you have the `basename' function. */ /* #undef HAVE_BASENAME */ @@ -173,6 +171,9 @@ /* Define to 1 if you have the `feof_unlocked' function. */ /* #undef HAVE_FEOF_UNLOCKED */ +/* Define this if you have ffmpeg library */ +/* #undef HAVE_FFMPEG */ + /* Define to 1 if you have the `fgets_unlocked' function. */ /* #undef HAVE_FGETS_UNLOCKED */ @@ -221,6 +222,9 @@ /* Define this if you have gnome-vfs installed */ /* #undef HAVE_GNOME_VFS */ +/* Define to 1 if you have the `hstrerror' function. */ +/* #undef HAVE_HSTRERROR */ + /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ @@ -240,7 +244,7 @@ /* #undef HAVE_IRIXAL */ /* Supports ISO _Pragma() macro */ -#define HAVE_ISOC99_PRAGMA +#define HAVE_ISOC99_PRAGMA 1 /* Define this if you have kernel statistics available via kstat interface */ /* #undef HAVE_KSTAT */ @@ -300,7 +304,7 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mempcpy' function. */ -/* #undef HAVE_MEMPCPY */ +#define HAVE_MEMPCPY 1 /* Define to 1 if you have the `memset' function. */ #define HAVE_MEMSET 1 @@ -329,6 +333,9 @@ /* Define this if you have OpenGL support available */ /* #undef HAVE_OPENGL */ +/* Define to 1 if you have the <postprocess.h> header file. */ +/* #undef HAVE_POSTPROCESS_H */ + /* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 @@ -336,7 +343,7 @@ /* #undef HAVE_SDL */ /* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV +/* #undef HAVE_SETENV */ /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 @@ -348,7 +355,7 @@ /* #undef HAVE_SIGSET */ /* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 +/* #undef HAVE_SNPRINTF */ /* Define 1 if you have Solaris CD-ROM support */ /* #undef HAVE_SOLARIS_CDROM */ @@ -356,6 +363,9 @@ /* Define this if you have speex */ /* #undef HAVE_SPEEX */ +/* Define to 1 if speex headers are eg. <speex/speex.h> */ +/* #undef HAVE_SPEEX_SUBDIR */ + /* Define to 1 if you have the <stdbool.h> header file. */ #define HAVE_STDBOOL_H 1 @@ -404,6 +414,9 @@ /* Define to 1 if you have the <sys/cdio.h> header file. */ /* #undef HAVE_SYS_CDIO_H */ +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +/* #undef HAVE_SYS_IOCTL_H */ + /* Define to 1 if you have the <sys/mixer.h> header file. */ /* #undef HAVE_SYS_MIXER_H */ @@ -477,7 +490,10 @@ /* #undef HAVE___ARGZ_STRINGIFY */ /* host os/cpu identifier */ -#define HOST_ARCH "mingw32/i686" +/* #undef HOST_ARCH */ + +/* Define this if built on Mac OS X/Darwin */ +/* #undef HOST_OS_DARWIN */ /* Define as const if the declaration of iconv() needs const. */ /* #undef ICONV_CONST */ @@ -486,7 +502,7 @@ /* #undef LIBMPEG2_MLIB */ /* Define 1 if you are compiling using MinGW */ -#define MINGW32 1 +/* #undef MINGW32 */ /* Define this if you want to load mlib lazily */ /* #undef MLIB_LAZYLOAD */ @@ -513,7 +529,7 @@ /* #undef SIZEOF_INT */ /* The size of a `long', as computed by sizeof. */ -/* #undef SIZEOF_LONG */ +#define SIZEOF_LONG 4 /* The size of a `long long', as computed by sizeof. */ /* #undef SIZEOF_LONG_LONG */ @@ -521,16 +537,16 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ /* #undef STACK_DIRECTION */ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1-rc3b" +#define VERSION "1-rc6" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ @@ -540,10 +556,10 @@ #define XINE_ACFLAGS "-I ${prefix}/share/aclocal" /* Define this to osd fonts dir location */ -/* #define XINE_FONTDIR "/usr/local/share/xine/libxine1/fonts" */ +#define XINE_FONTDIR exec_path_append_subdir("fonts") /* Path where catalog files will be. */ -/* #define XINE_LOCALEDIR "/usr/local/share/locale"*/ +#define XINE_LOCALEDIR exec_path_append_subdir("locale") /* xine major version number */ #define XINE_MAJOR 1 @@ -552,7 +568,7 @@ #define XINE_MINOR 0 /* Define this to plugins directory location */ -/* #define XINE_PLUGINDIR "/usr/local/lib/xine/plugins/1.0.0" */ +#define XINE_PLUGINDIR exec_path_append_subdir("plugins") /* xine sub version number */ #define XINE_SUB 0 @@ -561,10 +577,13 @@ #define X_DISPLAY_MISSING 1 /* enable warnings about being development release */ -#define _DEVELOPMENT_ +/* #undef _DEVELOPMENT_ */ /* enable GNU libc extension */ -#define _GNU_SOURCE +/* #undef _GNU_SOURCE */ + +/* Define this if you are ISO C9X compliant */ +#define _ISOC9X_SOURCE 1 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ /* #undef _LARGEFILE_SOURCE */ @@ -575,8 +594,8 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ #define inline __inline /* Define to `long' if <sys/types.h> does not define. */ @@ -584,3 +603,9 @@ /* Define to `unsigned' if <sys/types.h> does not define. */ /* #undef size_t */ + +/* Define the real type of socklen_t */ +#define socklen_t size_t + +/* define ssize_t to __int64 if it's missing in default includes */ +#define ssize_t __int64 diff --git a/win32/include/sys/time.h b/win32/include/msvc/sys/time.h index 074a8a1e6..074a8a1e6 100644 --- a/win32/include/sys/time.h +++ b/win32/include/msvc/sys/time.h diff --git a/win32/include/unistd.h b/win32/include/unistd.h index ae2cc4fcb..b08706535 100644 --- a/win32/include/unistd.h +++ b/win32/include/unistd.h @@ -37,12 +37,7 @@ #ifndef _SYS_UNISTD_H_ #define _SYS_UNISTD_H_ -#ifndef inline -# define inline __inline -#endif - #define mkdir( A, B ) _mkdir( A ) -#define lstat stat #ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) @@ -76,17 +71,6 @@ #define bzero( A, B ) memset( A, 0, B ) -#ifndef strcasecmp -# define strcasecmp _stricmp -#endif - -#ifndef strncasecmp -# define strncasecmp _strnicmp -#endif - -#define snprintf _snprintf -#define vsnprintf _vsnprintf - #define readlink(PATH, BUF, BUFSIZ) 0 #endif diff --git a/win32/include/xinesuppt.h b/win32/include/xinesuppt.h deleted file mode 100755 index bb61cdddb..000000000 --- a/win32/include/xinesuppt.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef XINESUPPT_H -#define XINESUPPT_H - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - - -void setenv(const char *name, const char *val, int _xx); - -#ifdef __cplusplus -} -#endif - -#endif /* XINESUPPT_H */ |