diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 10:55:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 10:55:02 +0200 |
| commit | fad80bc4fda7edec2b6a7c19dcd1a03600646fec (patch) | |
| tree | 995443565bb0c12bb06ff2bde8982ae8e4caa145 /nx-X11/programs/Xserver/hw/nxagent/Utils.h | |
| parent | b517b66efcbb30bb7f7add4fb5bfe48f3185b615 (diff) | |
| parent | 3bd41aaf7f882cb1df4ab62a064920b797c5b41d (diff) | |
| download | nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.tar.gz nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.tar.bz2 nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.zip | |
Merge branch 'uli42-pr/drop_double_min_max' into 3.6.x
Attributes GH PR #724: https://github.com/ArcticaProject/nx-libs/pull/724
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Utils.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Utils.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/nx-X11/programs/Xserver/hw/nxagent/Utils.h index 8a3335424..63904e23b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Utils.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Utils.h @@ -40,14 +40,6 @@ #define nxagentScale(i, ratio) (((i) * (ratio)) >> (PRECISION)) -#ifndef MIN -#define MIN(A, B) ( (A) < (B) ? (A) : (B) ) -#endif - -#ifndef MAX -#define MAX(A, B) ( (A) > (B) ? (A) : (B) ); -#endif - static inline const char * validateString(const char *str) { return str ? str : "(null)"; } |