gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 05:48:01 +01:00
Code Issues Projects Releases Wiki Activity

fixed bugs in configure.in, removed

Browse Source
This commit is contained in:
kojima
2001-01-05 23:32:10 +00:00
parent f8c8382b1e
commit d9540f37bf
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\
contrib contrib
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL \ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL \
Install acconfig.h INSTALL.pt README.pt\ Install acconfig.h INSTALL.pt README.pt\

6
WINGs/WUtil.h
View File

@@ -294,18 +294,18 @@ void WMFreeHashTable(WMHashTable *table);
void WMResetHashTable(WMHashTable *table); void WMResetHashTable(WMHashTable *table);
const void* WMHashGet(WMHashTable *table, const void *key); void* WMHashGet(WMHashTable *table, const void *key);
/* put data in table, replacing already existing data and returning /* put data in table, replacing already existing data and returning
* the old value */ * the old value */
const void* WMHashInsert(WMHashTable *table, const void *key, const void *data); void* WMHashInsert(WMHashTable *table, const void *key, const void *data);
void WMHashRemove(WMHashTable *table, const void *key); void WMHashRemove(WMHashTable *table, const void *key);
/* warning: do not manipulate the table while using these functions */ /* warning: do not manipulate the table while using these functions */
WMHashEnumerator WMEnumerateHashTable(WMHashTable *table); WMHashEnumerator WMEnumerateHashTable(WMHashTable *table);
const void* WMNextHashEnumeratorItem(WMHashEnumerator *enumerator); void* WMNextHashEnumeratorItem(WMHashEnumerator *enumerator);
unsigned WMCountHashTable(WMHashTable *table); unsigned WMCountHashTable(WMHashTable *table);

12
WINGs/hashtable.c
View File

@@ -186,7 +186,7 @@ WMFreeHashTable(WMHashTable *table)
const void* void*
WMHashGet(WMHashTable *table, const void *key) WMHashGet(WMHashTable *table, const void *key)
{ {
unsigned h; unsigned h;
@@ -211,14 +211,14 @@ WMHashGet(WMHashTable *table, const void *key)
} }
} }
if (item) if (item)
return item->data; return (void*)item->data;
else else
return NULL; return NULL;
} }
const void* void*
WMHashInsert(WMHashTable *table, const void *key, const void *data) WMHashInsert(WMHashTable *table, const void *key, const void *data)
{ {
unsigned h; unsigned h;
@@ -254,7 +254,7 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
RELKEY(table, item->key); RELKEY(table, item->key);
item->key = DUPKEY(table, key); item->key = DUPKEY(table, key);
return old; return (void*)old;
} else { } else {
HashItem *nitem; HashItem *nitem;
@@ -334,7 +334,7 @@ WMEnumerateHashTable(WMHashTable *table)
const void* void*
WMNextHashEnumeratorItem(WMHashEnumerator *enumerator) WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
{ {
const void *data = NULL; const void *data = NULL;
@@ -357,7 +357,7 @@ WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
enumerator->nextItem = ((HashItem*)enumerator->nextItem)->next; enumerator->nextItem = ((HashItem*)enumerator->nextItem)->next;
} }
return data; return (void*)data;
} }

3
configure.in
View File

@@ -184,7 +184,7 @@ if test "$ac_cv_prog_gcc" = yes; then
esac esac
changequote([,])dnl changequote([,])dnl
if $host_os != "linux"; then if test "$host_os" != "linux" -a "$host_os" != "linux-gnu" ; then
x86=0 x86=0
fi fi
@@ -864,6 +864,7 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \
WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \ WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \ WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
WPrefs.app/po/Makefile contrib/WindowMaker.spec ) WPrefs.app/po/Makefile contrib/WindowMaker.spec )
# plugins/Makefile plugins/libwmfun/Makefile)