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

configure.ac, iso9660.c: test for tzname variable.

Browse Source 
configure.ac, iso9660_fs.c: test for nls_langinfo() and #include <langinfo.h>
iso-info.c: some OS's need 2 args for multi-arg defines.
This commit is contained in:
rocky
2004-10-30 02:55:17 +00:00
parent 5cb455b932
commit 299e2ea2f9
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/iso9660.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660.c,v 1.23 2004/10/30 00:38:43 rocky Exp $
$Id: iso9660.c,v 1.24 2004/10/30 02:55:17 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -37,7 +37,7 @@
#include <stdio.h>
#endif
static const char _rcsid[] = "$Id: iso9660.c,v 1.23 2004/10/30 00:38:43 rocky Exp $";
static const char _rcsid[] = "$Id: iso9660.c,v 1.24 2004/10/30 02:55:17 rocky Exp $";
/* some parameters... */
#define SYSTEM_ID "CD-RTOS CD-BRIDGE"
@@ -101,7 +101,9 @@ iso9660_get_dtime (const iso9660_dtime_t *idr_date, bool b_localtime,
#if defined(HAVE_TM_GMTOFF) && defined(HAVE_TZSET)
if (b_localtime) {
tzset();
#if defined(HAVE_TZNAME)
p_tm->tm_zone = (char *) tzname;
#endif
#if defined(HAVE_DAYLIGHT)
p_tm->tm_isdst = daylight;
p_tm->tm_gmtoff = timezone;

10
lib/iso9660_fs.c
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660_fs.c,v 1.37 2004/10/29 02:11:48 rocky Exp $
$Id: iso9660_fs.c,v 1.38 2004/10/30 02:55:17 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -35,7 +35,9 @@
# include <iconv.h>
#endif
#ifdef HAVE_LANGINFO
#include <langinfo.h>
#endif
#include <cdio/cdio.h>
#include <cdio/bytesex.h>
@@ -49,7 +51,7 @@
#include <stdio.h>
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.37 2004/10/29 02:11:48 rocky Exp $";
static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.38 2004/10/30 02:55:17 rocky Exp $";
/* Implementation of iso9660_t type */
struct _iso9660 {
@@ -144,7 +146,11 @@ static bool
ucs2be_to_locale(ICONV_CONST char *psz_ucs2be, size_t i_inlen,
char **p_psz_out, size_t i_outlen)
{
#ifdef HAVE_NL_LANGINFO
iconv_t ic = iconv_open(nl_langinfo(CODESET), "UCS-2BE");
#else
iconv_t ic = iconv_open("ASCII", "UCS-2BE");
#endif
int rc;
char *psz_buf = NULL;
char *psz_buf2;