claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to make -mno-cygwin (no POSIX emulation on M$) work. In the

Browse Source 
process, in configure.ac might have broken cygwin when -mno-cygwin
isn't used. We'll see.
This commit is contained in:
rocky
2004-03-10 11:53:10 +00:00
parent 4c5c801d4e
commit 2a3d73ca21
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -16,7 +16,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
dnl 02111-1307, USA. dnl 02111-1307, USA.
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.69 2004/03/06 03:51:19 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.70 2004/03/10 11:53:10 rocky Exp $])dnl
AC_INIT(libcdio, 0.68cvs) AC_INIT(libcdio, 0.68cvs)
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@@ -259,7 +259,7 @@ int has_timeout=sizeof(test.timeout);],
[Define 1 if you are compiling using cygwin]) [Define 1 if you are compiling using cygwin])
AC_DEFINE([HAVE_WIN32_CDROM], [1], AC_DEFINE([HAVE_WIN32_CDROM], [1],
[Define 1 if you have MinGW CD-ROM support]) [Define 1 if you have MinGW CD-ROM support])
LIBS="$LIBS -lwinmm -mcygwin" LIBS="$LIBS -lwinmm"
cd_drivers="${cd_drivers}, MinGW" cd_drivers="${cd_drivers}, MinGW"
;; ;;
mingw*) mingw*)
@@ -288,7 +288,7 @@ AC_SUBST(HAVE_LINUX_CDROM)
AC_SUBST(HAVE_SOLARIS_CDROM) AC_SUBST(HAVE_SOLARIS_CDROM)
AC_SUBST(HAVE_WIN32_CDROM) AC_SUBST(HAVE_WIN32_CDROM)
AC_CHECK_FUNCS( bzero memcpy ) AC_CHECK_FUNCS( memset bzero memcpy )
AC_CHECK_MEMBER([struct tm.tm_gmtoff], AC_CHECK_MEMBER([struct tm.tm_gmtoff],
[AC_DEFINE(HAVE_TM_GMTOFF, 1, [AC_DEFINE(HAVE_TM_GMTOFF, 1,

10
lib/image/bincue.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp $ $Id: bincue.c,v 1.6 2004/03/10 11:53:10 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
(*.cue). (*.cue).
*/ */
static const char _rcsid[] = "$Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp $"; static const char _rcsid[] = "$Id: bincue.c,v 1.6 2004/03/10 11:53:10 rocky Exp $";
#include "cdio_assert.h" #include "cdio_assert.h"
#include "cdio_private.h" #include "cdio_private.h"
@@ -52,10 +52,10 @@ static const char _rcsid[] = "$Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp
#include <ctype.h> #include <ctype.h>
/* FIXME: should put in a common definition somewhere. */ /* FIXME: should put in a common definition somewhere. */
#ifdef HAVE_BZERO #ifdef HAVE_MEMSET
#define BZERO(ptr, size) bzero(ptr, size)
#elif HAVE_MEMSET
#define BZERO(ptr, size) memset(ptr, 0, size) #define BZERO(ptr, size) memset(ptr, 0, size)
#elif HAVE_BZERO
#define BZERO(ptr, size) bzero(ptr, size)
#else #else
Error -- you need either memset or bzero Error -- you need either memset or bzero
#endif #endif

7
lib/logging.c
View File

@@ -1,8 +1,8 @@
/* /*
$Id: logging.c,v 1.5 2003/11/09 13:57:51 rocky Exp $ $Id: logging.c,v 1.6 2004/03/10 11:53:10 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -30,8 +30,7 @@
#include <cdio/logging.h> #include <cdio/logging.h>
#include "cdio_assert.h" #include "cdio_assert.h"
static const char _rcsid[] = "$Id: logging.c,v 1.6 2004/03/10 11:53:10 rocky Exp $";
static const char _rcsid[] = "$Id: logging.c,v 1.5 2003/11/09 13:57:51 rocky Exp $";
cdio_log_level_t cdio_loglevel_default = CDIO_LOG_WARN; cdio_log_level_t cdio_loglevel_default = CDIO_LOG_WARN;