Use min/max instead of MIN/MAX.

diff --git a/server/registry.c b/server/registry.c
index 00b9ae5..5173f1c 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -350,7 +350,7 @@
 static void touch_key( struct key *key )
 {
     key->modif = time(NULL);
-    key->level = MAX( key->level, current_level );
+    key->level = max( key->level, current_level );
 }
 
 /* try to grow the array of subkeys; return 1 if OK, 0 on error */
@@ -1186,7 +1186,7 @@
     value->len  = len;
     value->type = type;
     /* update the key level but not the modification time */
-    key->level = MAX( key->level, current_level );
+    key->level = max( key->level, current_level );
     return 1;
 
  error:
diff --git a/server/trace.c b/server/trace.c
index 96145a8..0ef5f73 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -172,13 +172,13 @@
 
 static void dump_varargs_read_process_memory_reply( const struct read_process_memory_request *req )
 {
-    int count = MIN( req->len, get_req_size( req->data, sizeof(int) ) );
+    int count = min( req->len, get_req_size( req->data, sizeof(int) ) );
     dump_bytes( (unsigned char *)req->data, count * sizeof(int) );
 }
 
 static void dump_varargs_write_process_memory_request( const struct write_process_memory_request *req )
 {
-    int count = MIN( req->len, get_req_size( req->data, sizeof(int) ) );
+    int count = min( req->len, get_req_size( req->data, sizeof(int) ) );
     dump_bytes( (unsigned char *)req->data, count * sizeof(int) );
 }