Xlib warning fixes

This commit is contained in:
Colin Harrison 2008-04-21 17:24:33 +01:00 committed by Alan Hourihane
parent 6b6caeea83
commit f5c5ffc175
3 changed files with 6 additions and 6 deletions

View file

@ -98,16 +98,16 @@ GetHomeDir(
int len)
{
#ifdef WIN32
register char *ptr1;
register char *ptr2;
register char *ptr1 = NULL;
register char *ptr2 = NULL;
int len1 = 0, len2 = 0;
if (ptr1 = getenv("HOME")) { /* old, deprecated */
if ((ptr1 = getenv("HOME"))) { /* old, deprecated */
len1 = strlen (ptr1);
} else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
len1 = strlen (ptr1);
len2 = strlen (ptr2);
} else if (ptr2 = getenv("USERNAME")) {
} else if ((ptr2 = getenv("USERNAME"))) {
len1 = strlen (ptr1 = "/users/");
len2 = strlen (ptr2);
}

View file

@ -60,7 +60,7 @@ extern LockInfoPtr _Xi18n_lock;
#ifdef WIN32
static DWORD _X_TlsIndex = (DWORD)-1;
_Xthread_init()
void _Xthread_init()
{
if (_X_TlsIndex == (DWORD)-1)
_X_TlsIndex = TlsAlloc();

View file

@ -154,7 +154,7 @@ _XlcDefaultMapModifiers(
#ifdef WIN32
{
char *s;
for (s = mods; s = strchr(s, '@'); s++) {
for (s = mods; (s = strchr(s, '@')); s++) {
for (s++; *s && *s != '='; s++) {
if (*s == '#') {
*s = '=';