diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h index 471c7ec8..de10a9d2 100644 --- a/WINGs/WINGs/WUtil.h +++ b/WINGs/WINGs/WUtil.h @@ -156,20 +156,10 @@ typedef int WMArrayIterator; typedef void *WMBagIterator; -#if 0 -typedef struct { - char character; /* the escape character */ - char *value; /* value to place */ -} WMSEscapes; -#endif - - - typedef void WMNotificationObserverAction(void *observerData, WMNotification *notification); - /*......................................................................*/ typedef void waborthandler(int); @@ -211,8 +201,6 @@ void* wmalloc(size_t size); void* wrealloc(void *ptr, size_t newsize); void wfree(void *ptr); -#define wnew(type, count) wmalloc(sizeof(type)*count) - void wrelease(void *ptr); void* wretain(void *ptr); @@ -247,9 +235,6 @@ char* wtrimspace(const char *s); WMRange wmkrange(int start, int count); -#ifdef ANSI_C_DOESNT_LIKE_IT_THIS_WAY -#define wmkrange(position, count) (WMRange){(position), (count)} -#endif char* wusergnusteppath(void); @@ -259,11 +244,6 @@ char* wglobaldefaultspathfordomain(const char *domain); void wusleep(unsigned int microsec); -#if 0 -int wsprintesc(char *buffer, int length, char *format, WMSEscapes **escapes, - int count); -#endif - /*......................................................................*/ /* Event handlers: timer, idle, input */ @@ -392,8 +372,6 @@ void WMAppendArray(WMArray *array, WMArray *other); /* add will place the element at the end of the array */ void WMAddToArray(WMArray *array, void *item); -#define WMPushInArray(array, item) WMAddToArray(array, item) - /* insert will increment the index of elements after it by 1 */ void WMInsertInArray(WMArray *array, int index, void *item); diff --git a/configure.ac b/configure.ac index 5f791a0f..21aff286 100644 --- a/configure.ac +++ b/configure.ac @@ -52,8 +52,8 @@ WINGS_VERSION=$WINGS_CURRENT:$WINGS_REVISION:$WINGS_AGE AC_SUBST(WINGS_VERSION) dnl dnl libWUtil -WUTIL_CURRENT=1 -WUTIL_REVISION=2 +WUTIL_CURRENT=2 +WUTIL_REVISION=0 WUTIL_AGE=0 WUTIL_VERSION=$WUTIL_CURRENT:$WUTIL_REVISION:$WUTIL_AGE AC_SUBST(WUTIL_VERSION)