aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

Finish up the modifications to the Windows build. In case anything remains to be done, it'll be nits.

Browse Source 
git-svn-id: https://svn.xiph.org/trunk/ezstream@15798 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2009-03-18 20:24:35 +00:00
parent 9375b750e8
commit 5a0bfa143b
6 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.in
View File

@ -118,13 +118,6 @@ dnl ###########
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T AC_TYPE_SSIZE_T
AC_CHECK_TYPES(struct timeval, , ,
[
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
])
dnl ############### dnl ###############
dnl ## LIBRARIES ####################################################### dnl ## LIBRARIES #######################################################

4
src/compat.c
View File

@ -10,10 +10,6 @@
# include <libgen.h> # include <libgen.h>
#endif /* HAVE_LIBGEN_H && !__linux__ */ #endif /* HAVE_LIBGEN_H && !__linux__ */
#ifndef PATH_MAX
# define PATH_MAX 256
#endif /* !PATH_MAX */
#ifndef PATH_SEPARATORS #ifndef PATH_SEPARATORS
# define PATH_SEPARATORS "/" # define PATH_SEPARATORS "/"
#endif /* !PATH_SEPARATORS */ #endif /* !PATH_SEPARATORS */

11
src/ezstream.h
View File

@ -57,6 +57,10 @@
# endif /* WIN32 */ # endif /* WIN32 */
#endif /* !_PATH_DEVNULL */ #endif /* !_PATH_DEVNULL */
#ifndef PATH_MAX
# define PATH_MAX 256
#endif /* !PATH_MAX */
#if !defined(HAVE_PCLOSE) && defined(HAVE__PCLOSE) #if !defined(HAVE_PCLOSE) && defined(HAVE__PCLOSE)
# define pclose _pclose # define pclose _pclose
#endif /* !HAVE_PCLOSE && HAVE__PCLOSE */ #endif /* !HAVE_PCLOSE && HAVE__PCLOSE */
@ -92,13 +96,6 @@
# define sleep(a) Sleep((a) * 1000) # define sleep(a) Sleep((a) * 1000)
#endif /* WIN32 */ #endif /* WIN32 */
#ifndef HAVE_STRUCT_TIMEVAL
struct timeval {
long tv_sec;
long tv_usec;
};
#endif
/* /*
* For compat.c and getopt.c: * For compat.c and getopt.c:
*/ */

3
src/strtonum.c
View File

@ -22,11 +22,12 @@
# include "config.h" # include "config.h"
#endif #endif
#include "ezstream.h"
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include "strfctns.h" #include "strfctns.h"
#include "compat.h"
#define INVALID 1 #define INVALID 1
#define TOOSMALL 2 #define TOOSMALL 2

17
win32/compat.h
View File

@ -9,25 +9,8 @@
#define inline __inline #define inline __inline
#define popen _popen
#define pclose _pclose
#define snprintf _snprintf
#define stat _stat
#define strncasecmp strnicmp
#ifndef __GNUC__
# define strtoll _strtoi64
#endif /* !__GNUC__ */
#define sleep(a) Sleep((a) * 1000)
#define va_copy(dst, src) memcpy(&(dst), &(src), sizeof(va_list)) #define va_copy(dst, src) memcpy(&(dst), &(src), sizeof(va_list))
#define S_IRGRP 0
#define S_IROTH 0
#define S_IWGRP 0
#define S_IWOTH 0
#define S_IXGRP 0
#define S_IXOTH 0
#define PATH_SEPARATORS "\\/" #define PATH_SEPARATORS "\\/"
#ifndef ssize_t #ifndef ssize_t

7
win32/config.h
View File

@ -8,9 +8,12 @@
#define HAVE_LOCALE_H 1 #define HAVE_LOCALE_H 1
#define HAVE_STAT 1 #define HAVE_STAT 1
#define HAVE__PCLOSE 1
#define HAVE__POPEN 1
#define HAVE__SNPRINTF 1
#define HAVE__STRTOI64 1
#define HAVE_STRUCT_TIMEVAL 1 #define HAVE_ICONV 1
#define ICONV_CONST #define ICONV_CONST
#include <compat.h> #include <compat.h>