Merging in MSVC/XBOX from John Oseman

This commit is contained in:
rocky
2004-11-01 09:14:21 +00:00
parent e1a034f5d8
commit b8a37ff266
5 changed files with 398 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_generic.c,v 1.28 2004/10/31 13:58:44 rocky Exp $
$Id: _cdio_generic.c,v 1.29 2004/11/01 09:14:21 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -25,7 +25,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.28 2004/10/31 13:58:44 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.29 2004/11/01 09:14:21 rocky Exp $";
#include <stdio.h>
#include <stdlib.h>
@@ -47,6 +47,7 @@ static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.28 2004/10/31 13:58:44 ro
#include "cdio_assert.h"
#include "cdio_private.h"
#include "_cdio_stdio.h"
#include "portable.h"
/*!
Eject media -- there's nothing to do here. We always return 2.

View File

@@ -1,5 +1,5 @@
/*
$Id: portable.h,v 1.2 2004/10/31 14:55:35 rocky Exp $
$Id: portable.h,v 1.3 2004/11/01 09:14:21 rocky Exp $
Copyright (C) Rocky Bernstein <rocky@panix.com>
@@ -24,6 +24,9 @@
included other routines can be more portable.
*/
#ifndef __CDIO_PORTABLE_H__
#define __CDIO_PORTABLE_H__
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -46,3 +49,18 @@
#endif
#endif /*HAVE_SNPRINTF*/
#ifdef MSVC
#include <io.h>
#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
#endif /*MSVC*/
#endif /* __CDIO_PORTABLE_H__ */