Resolve conflict between defines (win32)
This commit is contained in:
parent
79a8d300e6
commit
fe8fe1a91c
goldlib/gall
@ -52,7 +52,7 @@ const char *get_charset(void)
|
||||
int segment, selector;
|
||||
__dpmi_regs regs;
|
||||
|
||||
strcpy(charsetbuf, DEFAULT_CHARSET);
|
||||
strcpy(charsetbuf, GOLDED_DEFAULT_CHARSET);
|
||||
if ((segment = __dpmi_allocate_dos_memory(3, &selector)) != -1) {
|
||||
regs.h.ah = 0x65;
|
||||
regs.h.al = 0x01;
|
||||
@ -74,13 +74,13 @@ const char *get_charset(void)
|
||||
ULONG CCP[8];
|
||||
ULONG cb;
|
||||
|
||||
strcpy(charsetbuf, DEFAULT_CHARSET);
|
||||
strcpy(charsetbuf, GOLDED_DEFAULT_CHARSET);
|
||||
if(DosQueryCp(sizeof (CCP), CCP, &cb) == 0)
|
||||
sprintf(charsetbuf, "CP%i", CCP[0]);
|
||||
#else
|
||||
const char *cp;
|
||||
|
||||
strcpy(charsetbuf, DEFAULT_CHARSET);
|
||||
strcpy(charsetbuf, GOLDED_DEFAULT_CHARSET);
|
||||
cp = setlocale(LC_CTYPE, "");
|
||||
if((cp != NULL) and ((cp = strchr(cp, '.')) != NULL)) {
|
||||
cp++;
|
||||
|
@ -29,7 +29,7 @@
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// Charset is set to this value if charset can't be taken from OS
|
||||
#define DEFAULT_CHARSET "CP437"
|
||||
#define GOLDED_DEFAULT_CHARSET "CP437"
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
const char *get_charset(void);
|
||||
|
Reference in New Issue
Block a user