summaryrefslogtreecommitdiff
path: root/desktop-shell
diff options
context:
space:
mode:
authorJon Cruz <jonc@osg.samsung.com>2015-06-15 15:37:09 -0700
committerBryce Harrington <bryce@osg.samsung.com>2015-06-15 17:11:52 -0700
commitd618f688d53e1df0ac31a275ae8541dc56f283ed (patch)
tree2491eabcb4e57b4a3e9604b2b09458f36e2255f8 /desktop-shell
parent35b2eaa989e4960501943c0753e2d5a3e687db92 (diff)
downloadweston-d618f688d53e1df0ac31a275ae8541dc56f283ed.tar.gz
Moved the MIN() macro to the helper include.
Removed multiple definitions of the MIN() macro from existing locations and unified with a single definition. Updated sources to use the shared version. Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'desktop-shell')
-rw-r--r--desktop-shell/shell.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 37936140..a60a3aa4 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -39,6 +39,7 @@
#include "desktop-shell-server-protocol.h"
#include "workspaces-server-protocol.h"
#include "shared/config-parser.h"
+#include "shared/helpers.h"
#include "xdg-shell-server-protocol.h"
#define DEFAULT_NUM_WORKSPACES 1