mirror of
https://github.com/fadden/ciderpress.git
synced 2024-06-02 14:41:32 +00:00
51b5f00f5c
CiderPress and MDC now compile, and execute far enough to open their respective "about" boxes, but I doubt they'll do much more than that. * Switch from MBCS to UNICODE APIs Microsoft switched to UTF-16 (by way of UCS-2) a long time ago, and the support for MBCS seems to be getting phased out. So it's time to switch to wide strings. This is a bit awkward for CiderPress because it works with disk and file archives with 8-bit filenames, and I want NufxLib and DiskImgLib to continue to work on Linux (which has largely taken the UTF-8 approach to Unicode). The libraries will continue to work with 8-bit filenames, with CiderPress/MDC doing the conversion at the appropriate point. There were a couple of places where strings from a structure handed back by one of the libraries were used directly in the UI, or vice-versa, which is a problem because we have nowhere to store the result of the conversion. These currently have fixed place-holder "xyzzy" strings. All UI strings are now wide. Various format strings now use "%ls" and "%hs" to explicitly specify wide and narrow. This doesn't play well with gcc, so only the Windows-specific parts use those. * Various updates to vcxproj files The project-file conversion had some cruft that is now largely gone. The build now has a common output directory for the EXEs and libraries, avoiding the old post-build copy steps. * Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots The old "prebuilts" directory is now gone. The libraries are now built as part of building the apps. I added a minimal set of files for zlib, and a full set for nufxlib. The Linux-specific nufxlib goodies are included for the benefit of the Linux utilities, which are currently broken (don't build). * Replace symbols used for include guards Symbols with a leading "__" are reserved.
110 lines
2.7 KiB
C
110 lines
2.7 KiB
C
/*
|
|
* Copyright (C) 2000-2007 by Andy McFadden, All Rights Reserved.
|
|
* This is free software; you can redistribute it and/or modify it under the
|
|
* terms of the BSD License, see the file COPYING-LIB.
|
|
*
|
|
* Misc stuff (shared between nufxlib and nulib2). This is a collection
|
|
* of miscellaneous types and macros that I find generally useful.
|
|
*/
|
|
#ifndef __MiscStuff__
|
|
#define __MiscStuff__
|
|
|
|
#define VALGRIND /* assume we're using it */
|
|
|
|
#include "SysDefs.h"
|
|
|
|
/*
|
|
* Use our versions of functions if they don't exist locally.
|
|
*/
|
|
#ifndef HAVE_STRERROR
|
|
#define strerror Nu_strerror
|
|
const char* Nu_strerror(int errnum);
|
|
#endif
|
|
#ifndef HAVE_MEMMOVE
|
|
#define memmove Nu_memmove
|
|
void* Nu_memmove(void *dest, const void *src, size_t n);
|
|
#endif
|
|
#ifndef HAVE_STRTOUL
|
|
#define strtoul Nu_strtoul
|
|
unsigned long Nu_strtoul(const char *nptr, char **endptr, int base);
|
|
#endif
|
|
#ifndef HAVE_STRCASECMP
|
|
#define strcasecmp Nu_strcasecmp
|
|
int Nu_strcasecmp(const char *s1, const char *s2);
|
|
#endif
|
|
#ifndef HAVE_STRNCASECMP
|
|
#define strncasecmp Nu_strncasecmp
|
|
int Nu_strncasecmp(const char *s1, const char *s2, size_t n);
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Misc types.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#define nil NULL /* I can't seem to stop typing 'nil' now */
|
|
|
|
typedef uchar Boolean;
|
|
#define false (0)
|
|
#define true (!false)
|
|
|
|
|
|
/*
|
|
* Handy macros.
|
|
*/
|
|
|
|
/* compute #of elements in a static array */
|
|
#define NELEM(x) (sizeof(x) / sizeof((x)[0]))
|
|
|
|
/* convert single hex digit char to number */
|
|
#define HexDigit(x) ( !isxdigit((int)(x)) ? -1 : \
|
|
(x) <= '9' ? (x) - '0' : toupper(x) +10 - 'A' )
|
|
|
|
/* convert number from 0-15 to hex digit */
|
|
#define HexConv(x) ( ((uint)(x)) <= 15 ? \
|
|
( (x) <= 9 ? (x) + '0' : (x) -10 + 'A') : -1 )
|
|
|
|
|
|
/*
|
|
* Debug stuff.
|
|
*/
|
|
|
|
/*
|
|
* Redefine this if you want assertions to do something other than default.
|
|
* Changing the definition of assert is tough, because assert.h redefines
|
|
* it every time it's included. On a Solaris 2.7 system I was using, gcc
|
|
* pulled assert.h in with some of the system headers, and their definition
|
|
* resulted in corrupted core dumps.
|
|
*/
|
|
#define Assert assert
|
|
|
|
#if defined(DEBUG_VERBOSE)
|
|
/* quick debug printf macro */
|
|
#define DBUG(args) printf args
|
|
#else
|
|
#define DBUG(args) ((void)0)
|
|
#endif
|
|
|
|
|
|
#if defined(NDEBUG)
|
|
#define DebugFill(addr, len) ((void)0)
|
|
|
|
#define DebugAbort() ((void)0)
|
|
|
|
#else
|
|
/* when debugging, fill Malloc blocks with junk, unless we're using Purify */
|
|
#if !defined(PURIFY) && !defined(VALGRIND)
|
|
#define DebugFill(addr, len) memset(addr, 0xa3, len)
|
|
#else
|
|
#define DebugFill(addr, len) ((void)0)
|
|
#endif
|
|
|
|
#define DebugAbort() abort()
|
|
#endif
|
|
|
|
#define kInvalidPtr ((void*)0xa3a3a3a3)
|
|
|
|
#endif /*__MiscStuff__*/
|