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

Hoist common "portable" definitions into portable.h

Browse Source 
NEWS - rearrange.
This commit is contained in:
rocky
2004-11-07 21:13:10 +00:00
parent e37155e627
commit 9a75dca071
4 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
NEWS
View File

@@ -1,5 +1,9 @@
0.71 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 - Make generic list routines and declarations and byte swapping
routines public. Eventually everything will use glib. routines public. Eventually everything will use glib.
- list-returning routines like iso9660_fs_readdir and - 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 - Add iso9660_ifs_is_xa() a routine to determine if an iso image has
XA attributes. XA attributes.
- iso-info now shows XA attributes if that is available. - 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 - Some bug fixes
@@ -153,4 +154,4 @@
0.1 0.1
Routines split off from VCDImager. 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 $

14
lib/image/bincue.c
View File

@@ -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) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -26,7 +26,7 @@
(*.cue). (*.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 "image.h"
#include "cdio_assert.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 #endif
#include <ctype.h> #include <ctype.h>
/* FIXME: should put in a common definition somewhere. */ #include "portable.h"
#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
/* reader */ /* reader */
#define DEFAULT_CDIO_DEVICE "videocd.bin" #define DEFAULT_CDIO_DEVICE "videocd.bin"

13
lib/image/cdrdao.c
View File

@@ -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> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
(*.cue). (*.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 "image.h"
#include "cdio_assert.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> #include <ctype.h>
/* FIXME: should put in a common definition somewhere. */ #include "portable.h"
#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
/* reader */ /* reader */

46
lib/portable.h
View File

@@ -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> Copyright (C) Rocky Bernstein <rocky@panix.com>
@@ -32,35 +32,43 @@
#endif #endif
#if !defined(HAVE_FTRUNCATE) #if !defined(HAVE_FTRUNCATE)
#if defined ( WIN32 ) # if defined ( WIN32 )
#define ftruncate chsize # define ftruncate chsize
#endif # endif
#endif /*HAVE_FTRUNCATE*/ #endif /*HAVE_FTRUNCATE*/
#if !defined(HAVE_SNPRINTF) #if !defined(HAVE_SNPRINTF)
#if defined ( MSVC ) # if defined ( MSVC )
#define snprintf _snprintf # define snprintf _snprintf
#endif # endif
#endif /*HAVE_SNPRINTF*/ #endif /*HAVE_SNPRINTF*/
#if !defined(HAVE_VSNPRINTF) #if !defined(HAVE_VSNPRINTF)
#if defined ( MSVC ) # if defined ( MSVC )
#define snprintf _vsnprintf # define snprintf _vsnprintf
#endif # endif
#endif /*HAVE_SNPRINTF*/ #endif /*HAVE_SNPRINTF*/
#ifdef MSVC #ifdef MSVC
#include <io.h> # include <io.h>
#ifndef S_ISBLK # ifndef S_ISBLK
#define _S_IFBLK 0060000 /* Block Special */ # define _S_IFBLK 0060000 /* Block Special */
#define S_ISBLK(x) (x & _S_IFBLK) # define S_ISBLK(x) (x & _S_IFBLK)
#endif # endif
#ifndef S_ISCHR # ifndef S_ISCHR
#define _S_IFCHR 0020000 /* character special */ # define _S_IFCHR 0020000 /* character special */
#define S_ISCHR(x) (x & _S_IFCHR) # define S_ISCHR(x) (x & _S_IFCHR)
#endif # endif
#endif /*MSVC*/ #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__ */ #endif /* __CDIO_PORTABLE_H__ */