Hoist common "portable" definitions into portable.h

NEWS - rearrange.

NEWS

@@ -1,5 +1,9 @@
 0.71
 
+- Some Joliet support.
+- Portability fixes for C++ and older C compilers. 
+- Work towards XBOX support.
+- TOC for DVD's works more often
 - Make generic list routines and declarations and byte swapping
   routines public. Eventually everything will use glib.
 - list-returning routines like iso9660_fs_readdir and
@@ -10,9 +14,6 @@
 - Add iso9660_ifs_is_xa() a routine to determine if an iso image has
   XA attributes.
 - iso-info now shows XA attributes if that is available. 
-- Some Joliet support.
-- Portability fixes for C++ and older C compilers. 
-- Work towards XBOX support.
 - Some bug fixes
 
 
@@ -153,4 +154,4 @@
 0.1
   Routines split off from VCDImager.
 
-$Id: NEWS,v 1.56 2004/11/06 09:16:04 rocky Exp $
+$Id: NEWS,v 1.57 2004/11/07 21:13:10 rocky Exp $

lib/image/bincue.c

@@ -1,5 +1,5 @@
 /*
-    $Id: bincue.c,v 1.46 2004/10/31 06:07:26 rocky Exp $
+    $Id: bincue.c,v 1.47 2004/11/07 21:13:10 rocky Exp $
 
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: bincue.c,v 1.46 2004/10/31 06:07:26 rocky Exp $";
+static const char _rcsid[] = "$Id: bincue.c,v 1.47 2004/11/07 21:13:10 rocky Exp $";
 
 #include "image.h"
 #include "cdio_assert.h"
@@ -57,15 +57,7 @@ static const char _rcsid[] = "$Id: bincue.c,v 1.46 2004/10/31 06:07:26 rocky Exp
 #endif
 #include <ctype.h>
 
-/* FIXME: should put in a common definition somewhere. */
-#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
-
+#include "portable.h"
 /* reader */
 
 #define DEFAULT_CDIO_DEVICE "videocd.bin"

lib/image/cdrdao.c

@@ -1,5 +1,5 @@
 /*
-    $Id: cdrdao.c,v 1.29 2004/10/31 06:07:26 rocky Exp $
+    $Id: cdrdao.c,v 1.30 2004/11/07 21:13:10 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
     toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: cdrdao.c,v 1.29 2004/10/31 06:07:26 rocky Exp $";
+static const char _rcsid[] = "$Id: cdrdao.c,v 1.30 2004/11/07 21:13:10 rocky Exp $";
 
 #include "image.h"
 #include "cdio_assert.h"
@@ -57,14 +57,7 @@ static const char _rcsid[] = "$Id: cdrdao.c,v 1.29 2004/10/31 06:07:26 rocky Exp
 
 #include <ctype.h>
 
-/* FIXME: should put in a common definition somewhere. */
-#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
+#include "portable.h"
 
 /* reader */
 

lib/portable.h

@@ -1,5 +1,5 @@
 /*
-    $Id: portable.h,v 1.3 2004/11/01 09:14:21 rocky Exp $
+    $Id: portable.h,v 1.4 2004/11/07 21:13:10 rocky Exp $
 
     Copyright (C) Rocky Bernstein <rocky@panix.com>
 
@@ -32,35 +32,43 @@
 #endif
 
 #if !defined(HAVE_FTRUNCATE)
-#if defined ( WIN32 )
-#define ftruncate chsize
-#endif
+# if defined ( WIN32 )
+#  define ftruncate chsize
+# endif
 #endif /*HAVE_FTRUNCATE*/
 
 #if !defined(HAVE_SNPRINTF)
-#if defined ( MSVC )
-#define snprintf _snprintf
-#endif
+# if defined ( MSVC )
+#  define snprintf _snprintf
+# endif
 #endif /*HAVE_SNPRINTF*/
 
 #if !defined(HAVE_VSNPRINTF)
-#if defined ( MSVC )
-#define snprintf _vsnprintf
-#endif
+# if defined ( MSVC )
+#  define snprintf _vsnprintf
+# endif
 #endif /*HAVE_SNPRINTF*/
 
 #ifdef MSVC
-#include <io.h>
+# include <io.h>
 
-#ifndef S_ISBLK
-#define _S_IFBLK        0060000  /* Block Special */
-#define S_ISBLK(x) (x & _S_IFBLK)
-#endif
+# ifndef S_ISBLK
+#  define _S_IFBLK        0060000  /* Block Special */
+#  define S_ISBLK(x) (x & _S_IFBLK)
+# endif
 
-#ifndef S_ISCHR
-#define	_S_IFCHR		0020000	/* character special */
-#define S_ISCHR(x) (x & _S_IFCHR)
-#endif
+# ifndef S_ISCHR
+#  define	_S_IFCHR 0020000	/* character special */
+#  define S_ISCHR(x) (x & _S_IFCHR)
+# endif
 #endif /*MSVC*/
 
+#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
+
 #endif /* __CDIO_PORTABLE_H__ */