From 21aa4eed6d0e90f9a9b548c1adaad7dccf2f4862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 6 Apr 2004 19:20:15 +0000 Subject: Prepare for MinGW port: move M$VC specific header files into sparate directory regenerate config.h for M$VC compilation fixes add some getchar()s into xineui.exe (popup dialogs would be better) CVS patchset: 6338 CVS date: 2004/04/06 19:20:15 --- win32/include/config.h | 496 ---------------------------------- win32/include/dlfcn.h | 13 +- win32/include/inttypes.h | 194 -------------- win32/include/msvc/config.h | 600 ++++++++++++++++++++++++++++++++++++++++++ win32/include/msvc/inttypes.h | 194 ++++++++++++++ win32/include/msvc/stdint.h | 155 +++++++++++ win32/include/stdint.h | 155 ----------- win32/include/unistd.h | 4 +- 8 files changed, 962 insertions(+), 849 deletions(-) delete mode 100644 win32/include/config.h delete mode 100644 win32/include/inttypes.h create mode 100644 win32/include/msvc/config.h create mode 100644 win32/include/msvc/inttypes.h create mode 100644 win32/include/msvc/stdint.h delete mode 100644 win32/include/stdint.h (limited to 'win32/include') diff --git a/win32/include/config.h b/win32/include/config.h deleted file mode 100644 index 0c4654f4f..000000000 --- a/win32/include/config.h +++ /dev/null @@ -1,496 +0,0 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - - -#ifndef _CONFIG_H_ -#define _CONFIG_H_ - -#if defined(WIN32) -#include -#include -#include -#endif - -/* Define this if you're running PowerPC architecture */ -/* #undef ARCH_PPC */ - -/* Define this if you're running x86 architecture */ -/*define ARCH_X86*/ - -/* maximum supported data alignment */ -#define ATTRIBUTE_ALIGNED_MAX 64 - -/* 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. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* 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. */ -#undef ENABLE_NLS - -/* Define this if you have Sun UltraSPARC CPU */ -/* #undef ENABLE_VIS */ - -/* Define to select libmad fixed pointarithmetic implementation */ -/* #undef FPM_64BIT */ - -/* Define to select libmad fixed point arithmetic implementation */ -/* #undef FPM_ARM */ - -/* Define to select libmad fixed point arithmetic implementation */ -/* #undef FPM_DEFAULT */ - -/* Define to select libmad fixed point arithmetic implementation */ -#define FPM_INTEL 1 - -/* Define to select libmad fixed point arithmetic implementation */ -/* #undef FPM_MIPS */ - -/* Define to select libmad fixed point arithmetic implementation */ -/* #undef FPM_PPC */ - -/* Define to select libmad fixed point arithmetic implementation */ -/* #undef FPM_SPARC */ - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#define HAVE_ALLOCA_H 1 - -/* Define this if you have Alsa (libasound) installed */ -/* #undef HAVE_ALSA */ - -/* Define this if you have alsa 0.9.x and more installed */ -/* #undef HAVE_ALSA09 */ - -/* Define this if your asoundlib.h is installed in alsa/ */ -/* #undef HAVE_ALSA_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define this if you have ARTS (libartsc) installed */ -/* #undef HAVE_ARTS */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_BYTESWAP_H */ - -/* Define this if you have CDROM ioctls */ -/* #undef HAVE_CDROM_IOCTLS */ - -/* Define to 1 if you have the `dcgettext' function. */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define this if you have a suitable version of libdvdnav */ -#define HAVE_DVDNAV 1 - -/* Define this if you have ESD (libesd) installed */ -/* #undef HAVE_ESD */ - -/* Define this if you have linux framebuffer support */ -/* #undef HAVE_FB */ - -/* Define to 1 if you have the `feof_unlocked' function. */ -/* #undef HAVE_FEOF_UNLOCKED */ - -/* Define to 1 if you have the `fgets_unlocked' function. */ -/* #undef HAVE_FGETS_UNLOCKED */ - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getegid' function. */ -#define HAVE_GETEGID 1 - -/* Define to 1 if you have the `geteuid' function. */ -#define HAVE_GETEUID 1 - -/* Define to 1 if you have the `getgid' function. */ -#define HAVE_GETGID 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `getpwuid_r' function. */ -#define HAVE_GETPWUID_R 1 - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define to 1 if you have the `getuid' function. */ -#define HAVE_GETUID 1 - -/* Define this if you have GLU support available */ -/* #undef HAVE_GLU */ - -/* Define this if you have GLut support available */ -/* #undef HAVE_GLUT */ - -/* Define this if you have gnome-vfs installed */ -/* #undef HAVE_GNOME_VFS */ - -/* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define this if you have ip_mreqn in netinet/in.h */ -/* #undef HAVE_IP_MREQN */ - -/* Define this if you have a usable IRIX al interface available */ -/* #undef HAVE_IRIXAL */ - -/* Define this if you have kernel statistics available via kstat interface */ -/* #undef HAVE_KSTAT */ - -/* Define if you have and nl_langinfo(CODESET). */ -/* #undef HAVE_LANGINFO_CODESET */ - -/* Define if your file defines LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 - -/* Define this if you have libfame mpeg encoder installed (fame.sf.net) */ -/* #undef HAVE_LIBFAME */ - -/* Define to 1 if you have the `posix4' library (-lposix4). */ -/* #undef HAVE_LIBPOSIX4 */ - -/* Define this if you have librte mpeg encoder installed (zapping.sf.net) */ -/* #undef HAVE_LIBRTE */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_CDROM_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mempcpy' function. */ -/* #undef HAVE_MEMPCPY */ - -/* Define this if you have mlib installed */ -/* #undef HAVE_MLIB */ - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `munmap' function. */ -#define HAVE_MUNMAP 1 - -/* Define to 1 if you have the `nanosleep' function. */ -/* #undef HAVE_NANOSLEEP */ - -/* Define this if you have libfame 0.8.10 or above */ -/* #undef HAVE_NEW_LIBFAME */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NL_TYPES_H */ - -/* Define this if you have OpenGL support available */ -/* #undef HAVE_OPENGL */ - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define this if you have SDL library installed */ -/* #undef HAVE_SDL */ - -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - -/* Define to 1 if you have the `sigaction' function. */ -#define HAVE_SIGACTION 1 - -/* Define to 1 if you have the `sigset' function. */ -/* #undef HAVE_SIGSET */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `stpcpy' function. */ -/* #undef HAVE_STPCPY */ - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strpbrk' function. */ -#define HAVE_STRPBRK 1 - -/* Define to 1 if you have the `strsep' function. */ -#define HAVE_STRSEP 1 - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define this if your asoundlib.h is installed in sys/ */ -/* #undef HAVE_SYS_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_CDIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MIXER_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_MMAN_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the `tsearch' function. */ -/* #undef HAVE_TSEARCH */ - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `vsscanf' function. */ -#define HAVE_VSSCANF 1 - -/* Define this if you have X11R6 installed */ -/* #undef HAVE_X11 */ - -/* Define this if you have libXinerama installed */ -/* #undef HAVE_XINERAMA */ - -/* Define this if you have libXv installed */ -/* #undef HAVE_XV */ - -/* Define this if you have libXv.a */ -/* #undef HAVE_XV_STATIC */ - -/* Define to 1 if you have the `__argz_count' function. */ -/* #undef HAVE___ARGZ_COUNT */ - -/* Define to 1 if you have the `__argz_next' function. */ -/* #undef HAVE___ARGZ_NEXT */ - -/* Define to 1 if you have the `__argz_stringify' function. */ -/* #undef HAVE___ARGZ_STRINGIFY */ - -/* Define as const if the declaration of iconv() needs const. */ -/* #undef ICONV_CONST */ - -/* Define this if you have mlib installed */ -/* #undef LIBA52_MLIB */ - -/* Define this if you have mlib installed */ -/* #undef LIBMPEG2_MLIB */ - -/* Name of package */ -#define PACKAGE "xine-lib" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* 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 */ -/* #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-beta6" - -/* xine major version number */ -#define XINE_MAJOR 1 - -/* xine minor version number */ -#define XINE_MINOR 0 - -/* xine sub version number */ -#define XINE_SUB 0 - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - - -/* Define this if you want nvtvd tvmode support */ -/* #undef XINE_HAVE_NVTV */ - -#define HAVE_DVDCSS_DVDCSS_H 1 - -#if defined(WIN32) - -/* Ridiculous hack to return valid xine support - * directories. These should be read from - * a registry entry set at install time. - */ - -static char tmp_win32_path[ 1024 ]; -static char * exec_path_append_subdir( char * string ) -{ - char * tmpchar; - char * cmdline; - char * back_slash; - char * fore_slash; - char * last_slash; - - // get program exec command line - cmdline = GetCommandLine(); - - // check for " at beginning of string - if( *cmdline == '\"' ) - { - // copy command line, skip first quote - strcpy( tmp_win32_path, cmdline + 1 ); - - // terminate at second set of quotes - tmpchar = strchr( tmp_win32_path, '\"' ); - *tmpchar = 0; - } - else - { - // copy command line - strcpy( tmp_win32_path, cmdline ); - - // terminate at first space - tmpchar = strchr( tmp_win32_path, ' ' ); - *tmpchar = 0; - } - - // find the last occurance of a back - // slash or fore slash - back_slash = strrchr( tmp_win32_path, '\\' ); - fore_slash = strrchr( tmp_win32_path, '/' ); - - // make sure the last back slash was not - // after a drive letter - if( back_slash > tmp_win32_path ) - if( *( back_slash - 1 ) == ':' ) - back_slash = 0; - - // which slash was the latter slash - if( back_slash > fore_slash ) - last_slash = back_slash; - else - last_slash = fore_slash; - - // detect if we had a relative or - // distiguished path ( had a slash ) - if( last_slash ) - { - // we had a slash charachter in our - // command line - *( last_slash + 1 ) = 0; - - // if had a string to append to the path - if( string ) - strcat( tmp_win32_path, string ); - } - else - { - // no slash, assume local directory - strcpy( tmp_win32_path, "./" ); - - // if had a string to append to the path - if( string ) - strcat( tmp_win32_path, string ); - } - - return tmp_win32_path; -} - -#define XINE_HOMEDIR exec_path_append_subdir( 0 ) -#define XINE_PLUGINDIR exec_path_append_subdir( "plugins" ) -#define XINE_FONTDIR exec_path_append_subdir( "fonts" ) -#define XINE_LOCALEDIR exec_path_append_subdir( "locale" ) - -#else - -/* Path where catalog files will be. */ -#define XINE_LOCALEDIR "/usr/local/share/locale" - -/* Define this to plugins directory location */ -#define XINE_PLUGINDIR "/usr/local/lib/xine/plugins/1.0.0" - -/* Define this if you're running x86 architecture */ -#define __i386__ 1 - -/* Path where aclocal m4 files will be. */ -#define XINE_ACFLAGS "-I ${prefix}/share/aclocal" - -#endif - -/* 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. */ -/* #undef inline */ - -/* Define to `long' if does not define. */ -/* #undef off_t */ - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -#endif /* defined CONFIG_H */ diff --git a/win32/include/dlfcn.h b/win32/include/dlfcn.h index 35074bcd1..b020daaac 100644 --- a/win32/include/dlfcn.h +++ b/win32/include/dlfcn.h @@ -24,10 +24,17 @@ * */ +#ifndef _DLFCN_H +#define _DLFCN_H + +#include + #define RTLD_LAZY 0 #define RTLD_GLOBAL 0 -#define dlopen( A, B ) LoadLibrary( A ) -#define dlclose( A ) FreeLibrary( A ) -#define dlsym( A, B ) ( void * ) GetProcAddress( A, B ) +#define dlopen( A, B ) ( void * )LoadLibrary( A ) +#define dlclose( A ) FreeLibrary( (HMODULE)A ) +#define dlsym( A, B ) ( void * ) GetProcAddress( (HMODULE)A, B ) #define dlerror() "dlerror" + +#endif diff --git a/win32/include/inttypes.h b/win32/include/inttypes.h deleted file mode 100644 index 0a1bd2867..000000000 --- a/win32/include/inttypes.h +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (C) 2000-2001 the xine project - * - * This file is part of xine, a unix video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * WIN32 PORT, - * by Matthew Grooms - * - * inttypes.h - Standard integer definitions. - * - */ - -#ifndef _SYS_INTTYPES_H_ -#define _SYS_INTTYPES_H_ - -#include - -#define int8_t signed char -#define int16_t signed short -#define int32_t signed long -#define int64_t signed hyper - -#define uint8_t unsigned char -#define uint16_t unsigned short -#define uint32_t unsigned long -#define uint64_t unsigned hyper - -#define intptr_t signed int -#define uintptr_t unsigned int - -#define __int8_t int8_t -#define __int16_t int16_t -#define __int32_t int32_t -#define __int64_t int64_t - -#define __uint8_t uint8_t -#define __uint16_t uint16_t -#define __uint32_t uint32_t -#define __uint64_t uint64_t - -#define __intptr_t intptr_t -#define __uintptr_t uintptr_t - -typedef __int64 ulonglong; -typedef __int64 longlong; - -#define __WORDSIZE 32 - -/* The ISO C99 standard specifies that these macros must only be - defined if explicitly requested. */ -#if !defined __cplusplus || defined __STDC_FORMAT_MACROS - -# if __WORDSIZE == 64 -# define __PRI64_PREFIX "l" -# define __PRIPTR_PREFIX "l" -# else -# define __PRI64_PREFIX "I64" -# define __PRIPTR_PREFIX -# endif - -/* Macros for printing format specifiers. */ - -/* Decimal notation. */ -# define PRId8 "d" -# define PRId16 "d" -# define PRId32 "d" -# define PRId64 __PRI64_PREFIX "d" - -# define PRIdLEAST8 "d" -# define PRIdLEAST16 "d" -# define PRIdLEAST32 "d" -# define PRIdLEAST64 __PRI64_PREFIX "d" - -# define PRIdFAST8 "d" -# define PRIdFAST16 "d" -# define PRIdFAST32 "d" -# define PRIdFAST64 __PRI64_PREFIX "d" - - -# define PRIi8 "i" -# define PRIi16 "i" -# define PRIi32 "i" -# define PRIi64 __PRI64_PREFIX "i" - -# define PRIiLEAST8 "i" -# define PRIiLEAST16 "i" -# define PRIiLEAST32 "i" -# define PRIiLEAST64 __PRI64_PREFIX "i" - -# define PRIiFAST8 "i" -# define PRIiFAST16 "i" -# define PRIiFAST32 "i" -# define PRIiFAST64 __PRI64_PREFIX "i" - -/* Octal notation. */ -# define PRIo8 "o" -# define PRIo16 "o" -# define PRIo32 "o" -# define PRIo64 __PRI64_PREFIX "o" - -# define PRIoLEAST8 "o" -# define PRIoLEAST16 "o" -# define PRIoLEAST32 "o" -# define PRIoLEAST64 __PRI64_PREFIX "o" - -# define PRIoFAST8 "o" -# define PRIoFAST16 "o" -# define PRIoFAST32 "o" -# define PRIoFAST64 __PRI64_PREFIX "o" - -/* Unsigned integers. */ -# define PRIu8 "u" -# define PRIu16 "u" -# define PRIu32 "u" -# define PRIu64 __PRI64_PREFIX "u" - -# define PRIuLEAST8 "u" -# define PRIuLEAST16 "u" -# define PRIuLEAST32 "u" -# define PRIuLEAST64 __PRI64_PREFIX "u" - -# define PRIuFAST8 "u" -# define PRIuFAST16 "u" -# define PRIuFAST32 "u" -# define PRIuFAST64 __PRI64_PREFIX "u" - -/* lowercase hexadecimal notation. */ -# define PRIx8 "x" -# define PRIx16 "x" -# define PRIx32 "x" -# define PRIx64 __PRI64_PREFIX "x" - -# define PRIxLEAST8 "x" -# define PRIxLEAST16 "x" -# define PRIxLEAST32 "x" -# define PRIxLEAST64 __PRI64_PREFIX "x" - -# define PRIxFAST8 "x" -# define PRIxFAST16 "x" -# define PRIxFAST32 "x" -# define PRIxFAST64 __PRI64_PREFIX "x" - -/* UPPERCASE hexadecimal notation. */ -# define PRIX8 "X" -# define PRIX16 "X" -# define PRIX32 "X" -# define PRIX64 __PRI64_PREFIX "X" - -# define PRIXLEAST8 "X" -# define PRIXLEAST16 "X" -# define PRIXLEAST32 "X" -# define PRIXLEAST64 __PRI64_PREFIX "X" - -# define PRIXFAST8 "X" -# define PRIXFAST16 "X" -# define PRIXFAST32 "X" -# define PRIXFAST64 __PRI64_PREFIX "X" - - -/* Macros for printing `intmax_t' and `uintmax_t'. */ -# define PRIdMAX __PRI64_PREFIX "d" -# define PRIiMAX __PRI64_PREFIX "i" -# define PRIoMAX __PRI64_PREFIX "o" -# define PRIuMAX __PRI64_PREFIX "u" -# define PRIxMAX __PRI64_PREFIX "x" -# define PRIXMAX __PRI64_PREFIX "X" - - -/* Macros for printing `intptr_t' and `uintptr_t'. */ -# define PRIdPTR __PRIPTR_PREFIX "d" -# define PRIiPTR __PRIPTR_PREFIX "i" -# define PRIoPTR __PRIPTR_PREFIX "o" -# define PRIuPTR __PRIPTR_PREFIX "u" -# define PRIxPTR __PRIPTR_PREFIX "x" -# define PRIXPTR __PRIPTR_PREFIX "X" - -#endif /* !defined __cplusplus || defined __STDC_FORMAT_MACROS */ - - -#endif diff --git a/win32/include/msvc/config.h b/win32/include/msvc/config.h new file mode 100644 index 000000000..8355d8569 --- /dev/null +++ b/win32/include/msvc/config.h @@ -0,0 +1,600 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Adjusting for MSVS: + * NLS disabled + * x86 disabled + * inline defined to __inline + * HAVE_SYS_PARAM_H disabled + * XINE_HOMEDIR + * XINE_PLUGINDIR + * XINE_FONTDIR + * XINE_LOCALEDIR + * HAVE_DLFCN_H 1 + * HAVE_SETENV 1 (FIXME: into utils.c) + */ + +#if defined(WIN32) + +#include +#include +#include + +#define ssize_t __int64 + +#ifndef PATH_MAX +#define PATH_MAX MAX_PATH +#endif + +/* Ridiculous hack to return valid xine support + * directories. These should be read from + * a registry entry set at install time. + */ +#define XINE_HOMEDIR exec_path_append_subdir( 0 ) +#define XINE_PLUGINDIR exec_path_append_subdir( "plugins" ) +#define XINE_FONTDIR exec_path_append_subdir( "plugins" ) +#define XINE_LOCALEDIR exec_path_append_subdir( "plugins" ) + +#define S_ISDIR(m) ((m) & _S_IFDIR) +#define S_ISREG(m) ((m) & _S_IFREG) +#define S_ISBLK(m) 0 +#define S_ISCHR(m) 0 + +#endif + + + +#ifdef inline +/* the strange formatting below is needed to prevent config.status from rewriting it */ +# undef \ + inline +#endif + + +/* Define this if you're running PowerPC architecture */ +/* #undef ARCH_PPC */ + +/* Define this if you're running x86 architecture */ +/* #define ARCH_X86 */ + +/* Define this if you're running x86 architecture */ +/* #undef ARCH_X86_64 */ + +/* maximum supported data alignment */ +#define ATTRIBUTE_ALIGNED_MAX 64 + +/* compiler does lsbf in struct bitfields */ +#define 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. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define 1 if you are compiling using cygwin */ +/* #undef CYGWIN */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* what to put between the brackets for empty arrays */ +#define 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 */ + +/* Define this if you have Sun UltraSPARC CPU */ +/* #undef ENABLE_VIS */ + +/* Define to select libmad fixed pointarithmetic implementation */ +/* #undef FPM_64BIT */ + +/* Define to select libmad fixed point arithmetic implementation */ +/* #undef FPM_ARM */ + +/* Define to select libmad fixed point arithmetic implementation */ +/* #undef FPM_DEFAULT */ + +/* Define to select libmad fixed point arithmetic implementation */ +#define FPM_INTEL 1 + +/* Define to select libmad fixed point arithmetic implementation */ +/* #undef FPM_MIPS */ + +/* Define to select libmad fixed point arithmetic implementation */ +/* #undef FPM_PPC */ + +/* Define to select libmad fixed point arithmetic implementation */ +/* #undef FPM_SPARC */ + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define this if you have Alsa (libasound) installed */ +/* #undef HAVE_ALSA */ + +/* Define this if you have alsa 0.9.x and more installed */ +/* #undef HAVE_ALSA09 */ + +/* Define this if your asoundlib.h is installed in alsa/ */ +/* #undef HAVE_ALSA_ASOUNDLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define this if you have ARTS (libartsc) installed */ +/* #undef HAVE_ARTS */ + +/* Define to 1 if you have the `basename' function. */ +/* #undef HAVE_BASENAME */ + +/* Define 1 if you have BSDI-type CD-ROM support */ +/* #undef HAVE_BSDI_CDROM */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +/* Define to 1 if you have the `bzero' function. */ +/* #undef HAVE_BZERO */ + +/* Define this if you have CDROM ioctls */ +/* #undef HAVE_CDROM_IOCTLS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COREFOUNDATION_CFBASE_H */ + +/* Define 1 if you have Darwin OS X-type CD-ROM support */ +/* #undef HAVE_DARWIN_CDROM */ + +/* Define to 1 if you have the `dcgettext' function. */ +/* #undef HAVE_DCGETTEXT */ + +/* Define this if you have DirectX */ +#define HAVE_DIRECTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define this if you have a suitable version of libdvdnav */ +/* #undef HAVE_DVDNAV */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DVD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define this if you have ESD (libesd) installed */ +/* #undef HAVE_ESD */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_EXECINFO_H */ + +/* Define this if you have linux framebuffer support */ +/* #undef HAVE_FB */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `feof_unlocked' function. */ +/* #undef HAVE_FEOF_UNLOCKED */ + +/* Define to 1 if you have the `fgets_unlocked' function. */ +/* #undef HAVE_FGETS_UNLOCKED */ + +/* Define 1 if you have FreeBSD CD-ROM support */ +/* #undef HAVE_FREEBSD_CDROM */ + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +/* #undef HAVE_FSEEKO */ + +/* Define this if you have freetype2 library */ +/* #undef HAVE_FT2 */ + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getegid' function. */ +/* #undef HAVE_GETEGID */ + +/* Define to 1 if you have the `geteuid' function. */ +/* #undef HAVE_GETEUID */ + +/* Define to 1 if you have the `getgid' function. */ +/* #undef HAVE_GETGID */ + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getpwuid_r' function. */ +/* #undef HAVE_GETPWUID_R */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `getuid' function. */ +/* #undef HAVE_GETUID */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GLOB_H */ + +/* Define this if you have GLU support available */ +/* #undef HAVE_GLU */ + +/* Define this if you have GLut support available */ +/* #undef HAVE_GLUT */ + +/* Define this if you have gnome-vfs installed */ +/* #undef HAVE_GNOME_VFS */ + +/* Define if you have the iconv() function. */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if the system has the type `int_fast8_t'. */ +#define HAVE_INT_FAST8_T 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IOKIT_IOKITLIB_H */ + +/* Define this if you have ip_mreqn in netinet/in.h */ +/* #undef HAVE_IP_MREQN */ + +/* Define this if you have a usable IRIX al interface available */ +/* #undef HAVE_IRIXAL */ + +/* Supports ISO _Pragma() macro */ +#define HAVE_ISOC99_PRAGMA + +/* Define this if you have kernel statistics available via kstat interface */ +/* #undef HAVE_KSTAT */ + +/* Define if you have and nl_langinfo(CODESET). */ +/* #undef HAVE_LANGINFO_CODESET */ + +/* Define if your file defines LC_MESSAGES. */ +/* #undef HAVE_LC_MESSAGES */ + +/* Define this if you have libfame mpeg encoder installed (fame.sf.net) */ +/* #undef HAVE_LIBFAME */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBGEN_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define this if you have png library */ +/* #undef HAVE_LIBPNG */ + +/* Define to 1 if you have the `posix4' library (-lposix4). */ +/* #undef HAVE_LIBPOSIX4 */ + +/* Define this if you have librte mpeg encoder installed (zapping.sf.net) */ +/* #undef HAVE_LIBRTE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define 1 if you have Linux-type CD-ROM support */ +/* #undef HAVE_LINUX_CDROM */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_CDROM_H */ + +/* Define 1 if timeout is in cdrom_generic_command struct */ +/* #undef HAVE_LINUX_CDROM_TIMEOUT */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_VERSION_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define this if the 'lrintf' function is declared in math.h */ +#define HAVE_LRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define this if you have mlib installed */ +/* #undef HAVE_MLIB */ + +/* Define to 1 if you have a working `mmap' system call. */ +/* #undef HAVE_MMAP */ + +/* define this if you have libmodplug installed */ +/* #undef HAVE_MODPLUG */ + +/* Define to 1 if you have the `munmap' function. */ +/* #undef HAVE_MUNMAP */ + +/* Define to 1 if you have the `nanosleep' function. */ +/* #undef HAVE_NANOSLEEP */ + +/* Define this if you have libfame 0.8.10 or above */ +/* #undef HAVE_NEW_LIBFAME */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NL_TYPES_H */ + +/* Define this if you have OpenGL support available */ +/* #undef HAVE_OPENGL */ + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define this if you have SDL library installed */ +/* #undef HAVE_SDL */ + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `sigaction' function. */ +/* #undef HAVE_SIGACTION */ + +/* Define to 1 if you have the `sigset' function. */ +/* #undef HAVE_SIGSET */ + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define 1 if you have Solaris CD-ROM support */ +/* #undef HAVE_SOLARIS_CDROM */ + +/* Define this if you have speex */ +/* #undef HAVE_SPEEX */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ +/* #undef HAVE_STPCPY */ + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strpbrk' function. */ +#define HAVE_STRPBRK 1 + +/* Define to 1 if you have the `strsep' function. */ +/* #undef HAVE_STRSEP */ + +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define this if your asoundlib.h is installed in sys/ */ +/* #undef HAVE_SYS_ASOUNDLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_CDIO_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MIXER_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MMAN_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PARAM_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_TIMES_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define this if you have theora */ +/* #undef HAVE_THEORA */ + +/* Define if struct tm has the tm_gmtoff member. */ +/* #undef HAVE_TM_GMTOFF */ + +/* Define to 1 if you have the `tsearch' function. */ +/* #undef HAVE_TSEARCH */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_UCONTEXT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define this if you have a suitable version of libcdio/libvcd */ +/* #undef HAVE_VCDNAV */ + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `vsscanf' function. */ +#define HAVE_VSSCANF 1 + +/* Define 1 if you have MinGW CD-ROM support */ +#define HAVE_WIN32_CDROM 1 + +/* Define this if you have X11R6 installed */ +/* #undef HAVE_X11 */ + +/* Define this if you have libXinerama installed */ +/* #undef HAVE_XINERAMA */ + +/* Define this if you have libXv installed */ +/* #undef HAVE_XV */ + +/* Define this if you have libXvMC installed */ +/* #undef HAVE_XVMC */ + +/* Define this if you have libXvMC.a */ +/* #undef HAVE_XVMC_STATIC */ + +/* Define this if you have libXv.a */ +/* #undef HAVE_XV_STATIC */ + +/* Define to 1 if you have the `__argz_count' function. */ +/* #undef HAVE___ARGZ_COUNT */ + +/* Define to 1 if you have the `__argz_next' function. */ +/* #undef HAVE___ARGZ_NEXT */ + +/* Define to 1 if you have the `__argz_stringify' function. */ +/* #undef HAVE___ARGZ_STRINGIFY */ + +/* host os/cpu identifier */ +#define HOST_ARCH "mingw32/i686" + +/* Define as const if the declaration of iconv() needs const. */ +/* #undef ICONV_CONST */ + +/* Define this if you have mlib installed */ +/* #undef LIBMPEG2_MLIB */ + +/* Define 1 if you are compiling using MinGW */ +#define MINGW32 1 + +/* Define this if you want to load mlib lazily */ +/* #undef MLIB_LAZYLOAD */ + +/* Name of package */ +#define PACKAGE "xine-lib" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of a `int', as computed by sizeof. */ +/* #undef SIZEOF_INT */ + +/* The size of a `long', as computed by sizeof. */ +/* #undef SIZEOF_LONG */ + +/* The size of a `long long', as computed by sizeof. */ +/* #undef SIZEOF_LONG_LONG */ + +/* 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 */ +/* #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 to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Path where aclocal m4 files will be. */ +#define XINE_ACFLAGS "-I ${prefix}/share/aclocal" + +/* Define this to osd fonts dir location */ +/* #define XINE_FONTDIR "/usr/local/share/xine/libxine1/fonts" */ + +/* Path where catalog files will be. */ +/* #define XINE_LOCALEDIR "/usr/local/share/locale"*/ + +/* xine major version number */ +#define XINE_MAJOR 1 + +/* xine minor version number */ +#define XINE_MINOR 0 + +/* Define this to plugins directory location */ +/* #define XINE_PLUGINDIR "/usr/local/lib/xine/plugins/1.0.0" */ + +/* xine sub version number */ +#define XINE_SUB 0 + +/* Define to 1 if the X Window System is missing or not being used. */ +#define X_DISPLAY_MISSING 1 + +/* enable warnings about being development release */ +#define _DEVELOPMENT_ + +/* enable GNU libc extension */ +#define _GNU_SOURCE + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* #undef _LARGEFILE_SOURCE */ + +/* Define this if you're running x86 architecture */ +#define __i386__ 1 + +/* 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 inline __inline + +/* Define to `long' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ diff --git a/win32/include/msvc/inttypes.h b/win32/include/msvc/inttypes.h new file mode 100644 index 000000000..b7e13daf3 --- /dev/null +++ b/win32/include/msvc/inttypes.h @@ -0,0 +1,194 @@ +/* + * Copyright (C) 2000-2004 the xine project + * + * This file is part of xine, a unix video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * WIN32 PORT, + * by Matthew Grooms + * + * inttypes.h - Standard integer definitions. + * + */ + +#ifndef _SYS_INTTYPES_H_ +#define _SYS_INTTYPES_H_ + +#include + +#define int8_t signed char +#define int16_t signed short +#define int32_t signed long +#define int64_t signed hyper + +#define uint8_t unsigned char +#define uint16_t unsigned short +#define uint32_t unsigned long +#define uint64_t unsigned hyper + +#define intptr_t signed int +#define uintptr_t unsigned int + +#define __int8_t int8_t +#define __int16_t int16_t +#define __int32_t int32_t +#define __int64_t int64_t + +#define __uint8_t uint8_t +#define __uint16_t uint16_t +#define __uint32_t uint32_t +#define __uint64_t uint64_t + +#define __intptr_t intptr_t +#define __uintptr_t uintptr_t + +typedef __int64 ulonglong; +typedef __int64 longlong; + +#define __WORDSIZE 32 + +/* The ISO C99 standard specifies that these macros must only be + defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_FORMAT_MACROS + +# if __WORDSIZE == 64 +# define __PRI64_PREFIX "l" +# define __PRIPTR_PREFIX "l" +# else +# define __PRI64_PREFIX "I64" +# define __PRIPTR_PREFIX +# endif + +/* Macros for printing format specifiers. */ + +/* Decimal notation. */ +# define PRId8 "d" +# define PRId16 "d" +# define PRId32 "d" +# define PRId64 __PRI64_PREFIX "d" + +# define PRIdLEAST8 "d" +# define PRIdLEAST16 "d" +# define PRIdLEAST32 "d" +# define PRIdLEAST64 __PRI64_PREFIX "d" + +# define PRIdFAST8 "d" +# define PRIdFAST16 "d" +# define PRIdFAST32 "d" +# define PRIdFAST64 __PRI64_PREFIX "d" + + +# define PRIi8 "i" +# define PRIi16 "i" +# define PRIi32 "i" +# define PRIi64 __PRI64_PREFIX "i" + +# define PRIiLEAST8 "i" +# define PRIiLEAST16 "i" +# define PRIiLEAST32 "i" +# define PRIiLEAST64 __PRI64_PREFIX "i" + +# define PRIiFAST8 "i" +# define PRIiFAST16 "i" +# define PRIiFAST32 "i" +# define PRIiFAST64 __PRI64_PREFIX "i" + +/* Octal notation. */ +# define PRIo8 "o" +# define PRIo16 "o" +# define PRIo32 "o" +# define PRIo64 __PRI64_PREFIX "o" + +# define PRIoLEAST8 "o" +# define PRIoLEAST16 "o" +# define PRIoLEAST32 "o" +# define PRIoLEAST64 __PRI64_PREFIX "o" + +# define PRIoFAST8 "o" +# define PRIoFAST16 "o" +# define PRIoFAST32 "o" +# define PRIoFAST64 __PRI64_PREFIX "o" + +/* Unsigned integers. */ +# define PRIu8 "u" +# define PRIu16 "u" +# define PRIu32 "u" +# define PRIu64 __PRI64_PREFIX "u" + +# define PRIuLEAST8 "u" +# define PRIuLEAST16 "u" +# define PRIuLEAST32 "u" +# define PRIuLEAST64 __PRI64_PREFIX "u" + +# define PRIuFAST8 "u" +# define PRIuFAST16 "u" +# define PRIuFAST32 "u" +# define PRIuFAST64 __PRI64_PREFIX "u" + +/* lowercase hexadecimal notation. */ +# define PRIx8 "x" +# define PRIx16 "x" +# define PRIx32 "x" +# define PRIx64 __PRI64_PREFIX "x" + +# define PRIxLEAST8 "x" +# define PRIxLEAST16 "x" +# define PRIxLEAST32 "x" +# define PRIxLEAST64 __PRI64_PREFIX "x" + +# define PRIxFAST8 "x" +# define PRIxFAST16 "x" +# define PRIxFAST32 "x" +# define PRIxFAST64 __PRI64_PREFIX "x" + +/* UPPERCASE hexadecimal notation. */ +# define PRIX8 "X" +# define PRIX16 "X" +# define PRIX32 "X" +# define PRIX64 __PRI64_PREFIX "X" + +# define PRIXLEAST8 "X" +# define PRIXLEAST16 "X" +# define PRIXLEAST32 "X" +# define PRIXLEAST64 __PRI64_PREFIX "X" + +# define PRIXFAST8 "X" +# define PRIXFAST16 "X" +# define PRIXFAST32 "X" +# define PRIXFAST64 __PRI64_PREFIX "X" + + +/* Macros for printing `intmax_t' and `uintmax_t'. */ +# define PRIdMAX __PRI64_PREFIX "d" +# define PRIiMAX __PRI64_PREFIX "i" +# define PRIoMAX __PRI64_PREFIX "o" +# define PRIuMAX __PRI64_PREFIX "u" +# define PRIxMAX __PRI64_PREFIX "x" +# define PRIXMAX __PRI64_PREFIX "X" + + +/* Macros for printing `intptr_t' and `uintptr_t'. */ +# define PRIdPTR __PRIPTR_PREFIX "d" +# define PRIiPTR __PRIPTR_PREFIX "i" +# define PRIoPTR __PRIPTR_PREFIX "o" +# define PRIuPTR __PRIPTR_PREFIX "u" +# define PRIxPTR __PRIPTR_PREFIX "x" +# define PRIXPTR __PRIPTR_PREFIX "X" + +#endif /* !defined __cplusplus || defined __STDC_FORMAT_MACROS */ + + +#endif diff --git a/win32/include/msvc/stdint.h b/win32/include/msvc/stdint.h new file mode 100644 index 000000000..fe934b846 --- /dev/null +++ b/win32/include/msvc/stdint.h @@ -0,0 +1,155 @@ +/* stdint.h - integer types + + Copyright 2003 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +/* + * Copyright (C) 2000-2004 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with self program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $Id: stdint.h,v 1.1 2004/04/06 19:20:21 valtri Exp $ + */ + +/* Modified original CygWin version for using by MSVC port. */ + +#ifndef _STDINT_H +#define _STDINT_H + +/* Exact-width integer types */ + +#include + +/* Limits of exact-width integer types */ + +#define INT8_MIN (-128) +#define INT16_MIN (-32768) +#define INT32_MIN (-2147483647 - 1) +#define INT64_MIN (-9223372036854775807LL - 1LL) + +#define INT8_MAX (127) +#define INT16_MAX (32767) +#define INT32_MAX (2147483647) +#define INT64_MAX (9223372036854775807LL) + +#define UINT8_MAX (255) +#define UINT16_MAX (65535) +#define UINT32_MAX (4294967295UL) +#define UINT64_MAX (18446744073709551615ULL) + +/* Limits of minimum-width integer types */ + +#define INT_LEAST8_MIN (-128) +#define INT_LEAST16_MIN (-32768) +#define INT_LEAST32_MIN (-2147483647 - 1) +#define INT_LEAST64_MIN (-9223372036854775807LL - 1LL) + +#define INT_LEAST8_MAX (127) +#define INT_LEAST16_MAX (32767) +#define INT_LEAST32_MAX (2147483647) +#define INT_LEAST64_MAX (9223372036854775807LL) + +#define UINT_LEAST8_MAX (255) +#define UINT_LEAST16_MAX (65535) +#define UINT_LEAST32_MAX (4294967295UL) +#define UINT_LEAST64_MAX (18446744073709551615ULL) + +/* Limits of fastest minimum-width integer types */ + +#define INT_FAST8_MIN (-128) +#define INT_FAST16_MIN (-2147483647 - 1) +#define INT_FAST32_MIN (-2147483647 - 1) +#define INT_FAST64_MIN (-9223372036854775807LL - 1LL) + +#define INT_FAST8_MAX (127) +#define INT_FAST16_MAX (2147483647) +#define INT_FAST32_MAX (2147483647) +#define INT_FAST64_MAX (9223372036854775807LL) + +#define UINT_FAST8_MAX (255) +#define UINT_FAST16_MAX (4294967295UL) +#define UINT_FAST32_MAX (4294967295UL) +#define UINT_FAST64_MAX (18446744073709551615ULL) + +/* Limits of integer types capable of holding object pointers */ + +#define INTPTR_MIN (-2147483647 - 1) +#define INTPTR_MAX (2147483647) +#define UINTPTR_MAX (4294967295UL) + +/* Limits of greatest-width integer types */ + +#define INTMAX_MIN (-9223372036854775807LL - 1LL) +#define INTMAX_MAX (9223372036854775807LL) +#define UINTMAX_MAX (18446744073709551615ULL) + +/* Limits of other integer types */ + +#ifndef PTRDIFF_MIN +#define PTRDIFF_MIN (-2147483647 - 1) +#define PTRDIFF_MAX (2147483647) +#endif + +#ifndef SIG_ATOMIC_MIN +#define SIG_ATOMIC_MIN (-2147483647 - 1) +#endif +#ifndef SIG_ATOMIC_MAX +#define SIG_ATOMIC_MAX (2147483647) +#endif + +#ifndef SIZE_MAX +#define SIZE_MAX (4294967295UL) +#endif + +#ifndef WCHAR_MIN +#ifdef __WCHAR_MIN__ +#define WCHAR_MIN __WCHAR_MIN__ +#define WCHAR_MAX __WCHAR_MAX__ +#else +#define WCHAR_MIN (0) +#define WCHAR_MAX (65535) +#endif +#endif + +#ifndef WINT_MIN +#define WINT_MIN (-2147483647 - 1) +#define WINT_MAX (2147483647) +#endif + +/* Macros for minimum-width integer constant expressions */ + +#define INT8_C(x) x +#define INT16_C(x) x +#define INT32_C(x) x ## L +#define INT64_C(x) x ## LL + +#define UINT8_C(x) x ## U +#define UINT16_C(x) x ## U +#define UINT32_C(x) x ## UL +#define UINT64_C(x) x ## ULL + +/* Macros for greatest-width integer constant expressions */ + +#define INTMAX_C(x) x ## L +#define UINTMAX_C(x) x ## UL + +#endif /* _STDINT_H */ diff --git a/win32/include/stdint.h b/win32/include/stdint.h deleted file mode 100644 index 6ddaf3fd6..000000000 --- a/win32/include/stdint.h +++ /dev/null @@ -1,155 +0,0 @@ -/* stdint.h - integer types - - Copyright 2003 Red Hat, Inc. - -This file is part of Cygwin. - -This software is a copyrighted work licensed under the terms of the -Cygwin license. Please consult the file "CYGWIN_LICENSE" for -details. */ - -/* - * Copyright (C) 2000-2004 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with self program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: stdint.h,v 1.1 2004/03/14 09:38:03 valtri Exp $ - */ - -/* Modified original CygWin version for using by MSVC port. */ - -#ifndef _STDINT_H -#define _STDINT_H - -/* Exact-width integer types */ - -#include - -/* Limits of exact-width integer types */ - -#define INT8_MIN (-128) -#define INT16_MIN (-32768) -#define INT32_MIN (-2147483647 - 1) -#define INT64_MIN (-9223372036854775807LL - 1LL) - -#define INT8_MAX (127) -#define INT16_MAX (32767) -#define INT32_MAX (2147483647) -#define INT64_MAX (9223372036854775807LL) - -#define UINT8_MAX (255) -#define UINT16_MAX (65535) -#define UINT32_MAX (4294967295UL) -#define UINT64_MAX (18446744073709551615ULL) - -/* Limits of minimum-width integer types */ - -#define INT_LEAST8_MIN (-128) -#define INT_LEAST16_MIN (-32768) -#define INT_LEAST32_MIN (-2147483647 - 1) -#define INT_LEAST64_MIN (-9223372036854775807LL - 1LL) - -#define INT_LEAST8_MAX (127) -#define INT_LEAST16_MAX (32767) -#define INT_LEAST32_MAX (2147483647) -#define INT_LEAST64_MAX (9223372036854775807LL) - -#define UINT_LEAST8_MAX (255) -#define UINT_LEAST16_MAX (65535) -#define UINT_LEAST32_MAX (4294967295UL) -#define UINT_LEAST64_MAX (18446744073709551615ULL) - -/* Limits of fastest minimum-width integer types */ - -#define INT_FAST8_MIN (-128) -#define INT_FAST16_MIN (-2147483647 - 1) -#define INT_FAST32_MIN (-2147483647 - 1) -#define INT_FAST64_MIN (-9223372036854775807LL - 1LL) - -#define INT_FAST8_MAX (127) -#define INT_FAST16_MAX (2147483647) -#define INT_FAST32_MAX (2147483647) -#define INT_FAST64_MAX (9223372036854775807LL) - -#define UINT_FAST8_MAX (255) -#define UINT_FAST16_MAX (4294967295UL) -#define UINT_FAST32_MAX (4294967295UL) -#define UINT_FAST64_MAX (18446744073709551615ULL) - -/* Limits of integer types capable of holding object pointers */ - -#define INTPTR_MIN (-2147483647 - 1) -#define INTPTR_MAX (2147483647) -#define UINTPTR_MAX (4294967295UL) - -/* Limits of greatest-width integer types */ - -#define INTMAX_MIN (-9223372036854775807LL - 1LL) -#define INTMAX_MAX (9223372036854775807LL) -#define UINTMAX_MAX (18446744073709551615ULL) - -/* Limits of other integer types */ - -#ifndef PTRDIFF_MIN -#define PTRDIFF_MIN (-2147483647 - 1) -#define PTRDIFF_MAX (2147483647) -#endif - -#ifndef SIG_ATOMIC_MIN -#define SIG_ATOMIC_MIN (-2147483647 - 1) -#endif -#ifndef SIG_ATOMIC_MAX -#define SIG_ATOMIC_MAX (2147483647) -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX (4294967295UL) -#endif - -#ifndef WCHAR_MIN -#ifdef __WCHAR_MIN__ -#define WCHAR_MIN __WCHAR_MIN__ -#define WCHAR_MAX __WCHAR_MAX__ -#else -#define WCHAR_MIN (0) -#define WCHAR_MAX (65535) -#endif -#endif - -#ifndef WINT_MIN -#define WINT_MIN (-2147483647 - 1) -#define WINT_MAX (2147483647) -#endif - -/* Macros for minimum-width integer constant expressions */ - -#define INT8_C(x) x -#define INT16_C(x) x -#define INT32_C(x) x ## L -#define INT64_C(x) x ## LL - -#define UINT8_C(x) x ## U -#define UINT16_C(x) x ## U -#define UINT32_C(x) x ## UL -#define UINT64_C(x) x ## ULL - -/* Macros for greatest-width integer constant expressions */ - -#define INTMAX_C(x) x ## L -#define UINTMAX_C(x) x ## UL - -#endif /* _STDINT_H */ diff --git a/win32/include/unistd.h b/win32/include/unistd.h index 2f8bc5989..a943dbffa 100644 --- a/win32/include/unistd.h +++ b/win32/include/unistd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2001 the xine project + * Copyright (C) 2000-2004 the xine project * * This file is part of xine, a unix video player. * @@ -37,7 +37,9 @@ #ifndef _SYS_UNISTD_H_ #define _SYS_UNISTD_H_ +#ifndef inline #define inline __inline +#endif #define mkdir( A, B ) _mkdir( A ) #define lstat stat -- cgit v1.2.3