diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-18 16:34:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-02 14:53:06 +0200 |
| commit | 72386e1718da8ccd1eb42bf1e8565b8f411cfc38 (patch) | |
| tree | cc64beec50e426a98856c3b9415d1a846f1f8524 /nx-X11/programs/Xserver/hw | |
| parent | 7d3d47f1f298e4f2e0c45a2beab089978bd7d407 (diff) | |
| download | nx-libs-72386e1718da8ccd1eb42bf1e8565b8f411cfc38.tar.gz nx-libs-72386e1718da8ccd1eb42bf1e8565b8f411cfc38.tar.bz2 nx-libs-72386e1718da8ccd1eb42bf1e8565b8f411cfc38.zip | |
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) )
^
```
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Utils.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 6131775d9..bfa28a0ce 100644 --- 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, diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/nx-X11/programs/Xserver/hw/nxagent/Utils.h index f5bd55d8b..ef8c4c714 100644 --- 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__ */ |