[gnome-control-center] wacom: Remove custom MAX() macro

[Bastien Nocera <hadess src gnome org>]

commit e44a3327f8ebb103f7dba4bb2713c7a13ab775f1
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 10 18:35:44 2012 +0000

    wacom: Remove custom MAX() macro

 panels/wacom/calibrator/gui_gtk.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/panels/wacom/calibrator/gui_gtk.c b/panels/wacom/calibrator/gui_gtk.c
index 8a59f99..e149248 100644
--- a/panels/wacom/calibrator/gui_gtk.c
+++ b/panels/wacom/calibrator/gui_gtk.c
@@ -30,8 +30,6 @@
 #include "calibrator.h"
 #include "gui_gtk.h"
 
-#define MAXIMUM(x,y) ((x) > (y) ? (x) : (y))
-
 /* Timeout parameters */
 const int time_step = 100;  /* in milliseconds */
 const int max_time = 15000; /* 5000 = 5 sec */
@@ -180,8 +178,8 @@ draw(GtkWidget *widget, cairo_t *cr, gpointer data)
     for (i = 0; i != HELP_LINES; i++)
     {
         cairo_text_extents(cr, help_text[i], &extent);
-        text_width = MAXIMUM(text_width, extent.width);
-        text_height = MAXIMUM(text_height, extent.height);
+        text_width = MAX(text_width, extent.width);
+        text_height = MAX(text_height, extent.height);
     }
     text_height += 2;