--- a/src/balloon_help.c	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/balloon_help.c	Mon Aug 13 11:35:02 2007 +0200
@@ -44,7 +44,7 @@
 
 #include "balloon_help.h"
 
-#ifndef WINDOWSNT
+#ifndef max
 #define max(x,y) (x>y?x:y)
 #endif
 
@@ -83,7 +83,7 @@
 static int    b_maskWidth, b_maskHeight;
 static GC     b_maskGC;
 
-static CONST char* b_text;
+static const char* b_text;
 static int b_width, b_height;
 
 static XtIntervalId b_timer;
@@ -214,7 +214,7 @@
 ============================================================================*/
 
 static void
-text_extent (XFontStruct* fontStruct, CONST char* text, int len,
+text_extent (XFontStruct* fontStruct, const char* text, int len,
 	     int* width, int* height)
 {
   XCharStruct extent;
@@ -227,13 +227,13 @@
 }
 
 static void
-get_text_size (Display* dpy, XFontStruct* fontStruct, CONST char* text,
+get_text_size (Display* dpy, XFontStruct* fontStruct, const char* text,
 	       int* max_width, int* max_height)
 {
   int width;
   int height;
-  CONST char* start;
-  CONST char* end;
+  const char* start;
+  const char* end;
 
   *max_width = *max_height = 0;
 
@@ -257,10 +257,10 @@
 
 static void
 draw_text (Display* dpy, Window win, GC gc, XFontStruct* fontStruct,
-	   int x, int y, CONST char* text)
+	   int x, int y, const char* text)
 {
-  CONST char* start;
-  CONST char* end;
+  const char* start;
+  const char* end;
   int font_height;
 
   y += fontStruct->ascent;
@@ -538,7 +538,7 @@
 }
 
 void
-balloon_help_show (CONST char* text)
+balloon_help_show (const char* text)
 {
   assert (b_dpy != NULL);