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

Repair some fallout from previous commits, and work more on Win32 builds.

Browse Source 
git-svn-id: https://svn.xiph.org/trunk/ezstream@15795 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2009-03-18 19:55:20 +00:00
parent c0b09af703
commit 7e8656313d
5 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@ -228,13 +228,24 @@ dnl #######################
AC_CHECK_FUNCS([ \
arc4random \
basename \
gettimeofday \
getopt \
gettimeofday \
nl_langinfo \
pclose \
_pclose \
popen \
_popen \
random \
setlocale \
snprintf \
_snprintf \
srandomdev \
stat \
_stat \
strncasecmp \
strnicmp \
strtoll \
_strtoi64 \
])
AC_REPLACE_FUNCS([ \

6
src/compat.c
View File

@ -18,9 +18,9 @@
# define PATH_SEPARATORS "/"
#endif /* !PATH_SEPARATORS */
char * local_basename(const char *);
const char *path_separators = PATH_SEPARATORS;
static const char *path_separators = PATH_SEPARATORS;
char * local_basename(const char *);
static inline int
is_separator(int);
@ -83,7 +83,7 @@ local_basename(const char *path)
* list as the default.
*/
if (endp == path && is_separator(*endp)) {
bname[0] = PATH_SEPARATOR;
bname[0] = path_separators[0];
bname[1] = '\0';
return (bname);
}

2
src/ezstream.c
View File

@ -1044,7 +1044,7 @@ getProgname(const char *argv0)
if (argv0 == NULL)
return ((char *)"ezstream");
p = strrchr(argv0, PATH_SEPARATOR);
p = strrchr(argv0, path_separators[0]);
if (p == NULL)
p = (char *)argv0;
else

50
src/ezstream.h
View File

@ -57,25 +57,38 @@
# endif /* WIN32 */
#endif /* !_PATH_DEVNULL */
#if !defined(HAVE_PCLOSE) && defined(HAVE__PCLOSE)
# define pclose _pclose
#endif /* !HAVE_PCLOSE && HAVE__PCLOSE */
#if !defined(HAVE_POPEN) && defined(HAVE__POPEN)
# define popen _popen
#endif /* !HAVE_POPEN && HAVE__POPEN */
#if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF)
# define snprintf _snprintf
#endif /* !HAVE_SNPRINTF && HAVE__SNPRINTF */
#if !defined(HAVE_STAT) && defined(HAVE__STAT)
# define stat _stat
#endif /* !HAVE_STAT && HAVE__STAT */
#if !defined(HAVE_STRNCASECMP) && defined(HAVE_STRNICMP)
# define strncasecmp strnicmp
#endif /* !HAVE_STRNCASECMP && HAVE_STRNICMP */
#if !defined(HAVE_STRTOLL) && defined(HAVE__STRTOI64)
# define strtoll _strtoi64
#endif /* !HAVE_STRTOLL && HAVE__STRTOI64 */
#ifndef S_IRGRP
# define S_IRGRP 0
# define S_IWGRP 0
# define S_IXGRP 0
#endif /* !S_IRGRP */
#ifndef S_IROTH
# define S_IROTH 0
# define S_IWOTH 0
# define S_IXOTH 0
#endif /* !S_IROTH */
#ifdef WIN32
# include <windows.h>
# define pclose _pclose
# define popen _popen
# define snprintf _snprintf
# define stat _stat
# define strncasecmp strnicmp
# ifndef __GNUC__
# define strtoll _strtoi64
# endif /* !__GNUC__ */
# 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 sleep(a) Sleep((a) * 1000)
#endif /* WIN32 */
@ -98,6 +111,9 @@ extern char *optarg;
extern int
local_getopt(int, char * const *, const char *);
extern const char *path_separators;
extern char *
local_basename(const char *);

4
win32/ezstream.vcproj
View File

@ -244,11 +244,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\src\compat.h"
RelativePath="..\src\configfile.h"
>
</File>
<File
RelativePath="..\src\configfile.h"
RelativePath="..\src\ezstream.h"
>
</File>
<File