bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflict between defines (win32)

Browse Source
This commit is contained in:
Stas Degteff 2007-02-05 08:23:18 +00:00
parent 79a8d300e6
commit fe8fe1a91c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
goldlib/gall/gcharset.cpp
View File

@ -52,7 +52,7 @@ const char *get_charset(void)
int segment, selector; int segment, selector;
__dpmi_regs regs; __dpmi_regs regs;
strcpy(charsetbuf, DEFAULT_CHARSET); strcpy(charsetbuf, GOLDED_DEFAULT_CHARSET);
if ((segment = __dpmi_allocate_dos_memory(3, &selector)) != -1) { if ((segment = __dpmi_allocate_dos_memory(3, &selector)) != -1) {
regs.h.ah = 0x65; regs.h.ah = 0x65;
regs.h.al = 0x01; regs.h.al = 0x01;
@ -74,13 +74,13 @@ const char *get_charset(void)
ULONG CCP[8]; ULONG CCP[8];
ULONG cb; ULONG cb;
strcpy(charsetbuf, DEFAULT_CHARSET); strcpy(charsetbuf, GOLDED_DEFAULT_CHARSET);
if(DosQueryCp(sizeof (CCP), CCP, &cb) == 0) if(DosQueryCp(sizeof (CCP), CCP, &cb) == 0)
sprintf(charsetbuf, "CP%i", CCP[0]); sprintf(charsetbuf, "CP%i", CCP[0]);
#else #else
const char *cp; const char *cp;
strcpy(charsetbuf, DEFAULT_CHARSET); strcpy(charsetbuf, GOLDED_DEFAULT_CHARSET);
cp = setlocale(LC_CTYPE, ""); cp = setlocale(LC_CTYPE, "");
if((cp != NULL) and ((cp = strchr(cp, '.')) != NULL)) { if((cp != NULL) and ((cp = strchr(cp, '.')) != NULL)) {
cp++; cp++;

2
goldlib/gall/gcharset.h
View File

@ -29,7 +29,7 @@
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Charset is set to this value if charset can't be taken from OS // 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); const char *get_charset(void);