From 2a3d73ca21b7b8b47f3cee0135d9d00935e530bb Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Wed, 10 Mar 2004 11:53:10 +0000
Subject: [PATCH] Changes to make -mno-cygwin (no POSIX emulation on M$) work.
 In the process, in configure.ac might have broken cygwin when -mno-cygwin
 isn't used. We'll see.

---
 configure.ac       |  6 +++---
 lib/image/bincue.c | 10 +++++-----
 lib/logging.c      |  7 +++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 39b27a28..6889473f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 dnl 02111-1307, USA.
 
 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_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
@@ -259,7 +259,7 @@ int has_timeout=sizeof(test.timeout);],
                   [Define 1 if you are compiling using cygwin])
      	AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                   [Define 1 if you have MinGW CD-ROM support])
- 	LIBS="$LIBS -lwinmm -mcygwin"
+ 	LIBS="$LIBS -lwinmm"
   	cd_drivers="${cd_drivers}, MinGW"
 	;;
      mingw*)
@@ -288,7 +288,7 @@ AC_SUBST(HAVE_LINUX_CDROM)
 AC_SUBST(HAVE_SOLARIS_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_DEFINE(HAVE_TM_GMTOFF, 1,
diff --git a/lib/image/bincue.c b/lib/image/bincue.c
index 9f66a8e0..784d7536 100644
--- a/lib/image/bincue.c
+++ b/lib/image/bincue.c
@@ -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) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
    (*.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_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>
 
 /* FIXME: should put in a common definition somewhere. */
-#ifdef HAVE_BZERO
-#define BZERO(ptr, size) bzero(ptr, size)
-#elif  HAVE_MEMSET
+#ifdef HAVE_MEMSET
 #define BZERO(ptr, size) memset(ptr, 0, size)
+#elif  HAVE_BZERO
+#define BZERO(ptr, size) bzero(ptr, size)
 #else 
   Error -- you need either memset or bzero
 #endif
diff --git a/lib/logging.c b/lib/logging.c
index 28cec0f7..8998fc4f 100644
--- a/lib/logging.c
+++ b/lib/logging.c
@@ -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) 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
     it under the terms of the GNU General Public License as published by
@@ -30,8 +30,7 @@
 #include <cdio/logging.h>
 #include "cdio_assert.h"
 
-
-static const char _rcsid[] = "$Id: logging.c,v 1.5 2003/11/09 13:57:51 rocky Exp $";
+static const char _rcsid[] = "$Id: logging.c,v 1.6 2004/03/10 11:53:10 rocky Exp $";
 
 cdio_log_level_t cdio_loglevel_default = CDIO_LOG_WARN;