--- libxfce4util-4.0.4/libxfce4util/util.h.orig	2003-12-17 15:57:10.636741000 -0500
+++ libxfce4util-4.0.4/libxfce4util/util.h	2003-12-18 01:42:20.922242000 -0500
@@ -33,18 +33,18 @@
 
 /* save way to get path to users home directory and files below */
 extern G_CONST_RETURN gchar *xfce_get_homedir(void);
-#define xfce_get_homefile(first_element...)	\
+#define xfce_get_homefile(first_element,...)	\
 	(g_build_filename(xfce_get_homedir(),	\
-		## first_element))
+		first_element, __VA_ARGS__))
 
 extern G_CONST_RETURN gchar *xfce_get_homefile_r(gchar *buffer,
 		size_t length, const gchar *format, ...);
 
 /* save way to get path to users ".xfce4" directory */
 extern G_CONST_RETURN gchar *xfce_get_userdir(void);
-#define xfce_get_userfile(first_element...)	\
+#define xfce_get_userfile(first_element,...)	\
 	(g_build_filename(xfce_get_userdir(),	\
-		## first_element))
+		first_element,__VA_ARGS__))
 
 extern G_CONST_RETURN gchar *xfce_get_userfile_r(gchar *buffer,
 		size_t length, const gchar *format, ...);
--- libxfce4util-4.0.4/libxfce4util/debug.h.orig	2003-12-17 15:52:44.886178000 -0500
+++ libxfce4util-4.0.4/libxfce4util/debug.h	2003-12-18 01:42:20.888882000 -0500
@@ -27,7 +27,7 @@
 #ifndef __LIBXFCE4UTIL_DEBUG_H__
 #define __LIBXFCE4UTIL_DEBUG_H__
 
-#if defined(DEBUG) && DEBUG > 0
+#if defined(DEBUG) && (DEBUG > 0)
 
 #include <stdio.h>
 
@@ -39,32 +39,32 @@
 #define __DBG_FUNC__    "??"
 #endif
 
-#define DBG(fmt, args...)                                                   \
+#define DBG(...)                                                   \
 {                                                                           \
     fprintf(stderr, "DBG[%s:%d] %s(): ", __FILE__, __LINE__, __DBG_FUNC__); \
-    fprintf(stderr, fmt, ##args);                                           \
+    fprintf(stderr, __VA_ARGS__);                                           \
     fprintf(stderr, "\n");                                                  \
 }
 
 #if defined(DEBUG_TRACE) && DEBUG_TRACE > 0
 
-#define TRACE(fmt, args...)						    \
+#define TRACE(...)						    \
 {                                                                           \
     fprintf(stderr, "TRACE[%s:%d] %s(): ",__FILE__,__LINE__,__DBG_FUNC__);  \
-    fprintf(stderr, fmt, ##args);                                           \
+    fprintf(stderr, __VA_ARGS__);                                           \
     fprintf(stderr, "\n");                                                  \
 }
 
 #else /* !defined(DEBUG_TRACE) || DEBUG_TRACE <= 0 */
 
-#define TRACE(fmt, args...) { do {} while(0); }
+#define TRACE(...) { do {} while(0); }
 
 #endif
 
 #else /* !defined(DEBUG) || DEBUG <= 0 */
 
-#define DBG(fmt, args...)   { do {} while(0); }
-#define TRACE(fmt, args...) { do {} while(0); }
+#define DBG(...)   /**/
+#define TRACE(...)  /**/
 
 #endif