hw/nxagent/Screen.c: Correctly use already defined MIN/MAX macros.

Use MIN(A,B) macro as defined in Utils.h. Add MAX(A,B) macro in Utils.h, as well. Don't have another set of MIN/MAX macro definitions in Screen.c. Amends the following compiler warnings: ``` Screen.c:3600:0: warning: "MIN" redefined #define MIN(a,b) ((a) < (b)) ? (a) : (b); ^ In file included from Screen.c:78:0: Utils.h:36:0: note: this is the location of the previous definition #define MIN(A, B) ( (A) < (B) ? (A) : (B) ) ^ ```

hw/nxagent/Screen.c: Correctly use already defined MIN/MAX macros.
72386e17 · Mike Gabriel · 7d3d47f1 · 72386e17 · 72386e17
Commit 72386e17 authored Mar 18, 2016 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Screen.c nx-X11/programs/Xserver/hw/nxagent/Screen.c +0 -4

Utils.h nx-X11/programs/Xserver/hw/nxagent/Utils.h +4 -0

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3595,10 +3595,6 @@ Bool nxagentReconnectScreen(void *p0)
  return True;  
 }

-/* FIXME: there must be such macros somewhere already...*/
-#define MAX(a,b) ((a) > (b)) ? (a) : (b);
-#define MIN(a,b) ((a) < (b)) ? (a) : (b);
-
 /* intersect two rectangles */
 Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah,
 	       int bx1, int by1, unsigned int bw, unsigned int bh,

--- a/nx-X11/programs/Xserver/hw/nxagent/Utils.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
@@ -36,4 +36,8 @@
 #define MIN(A, B) ( (A) < (B) ? (A) : (B) )
 #endif

+#ifndef MAX
+#define MAX(A, B) ( (A) > (B) ? (A) : (B) );
+#endif
+
 #endif /* __Utils_H__ */