From c5b4485b9e45b69fc5fde394ad0904d4bffc4c29 Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@conformal.com>
Date: Wed, 25 Nov 2009 16:12:13 +0000
Subject: [PATCH] *sigh* work around linking retardation

---
 osx/Makefile |    2 +-
 osx/osx.c    |    2 +-
 osx/osx.h    |    3 +++
 osx/util.h   |    3 ---
 scrotwm.c    |    4 ++++
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 osx/osx.h
 delete mode 100644 osx/util.h

diff --git a/osx/Makefile b/osx/Makefile
index 532b8af..34e749e 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,6 +1,6 @@
 # $scrotwm$ 
 
-CFLAGS+= -O2 -Wall -ggdb -D_GNU_SOURCE -I.
+CFLAGS+= -O2 -Wall -ggdb -D_GNU_SOURCE -D__OSX__ -I.
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
 LDADD+=  -L/usr/X11/lib/ -lX11 -lXrandr
 
diff --git a/osx/osx.c b/osx/osx.c
index 4d27aa8..2726b74 100644
--- a/osx/osx.c
+++ b/osx/osx.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util.h"
+#include "osx.h"
 
 /* --------------------------------------------------------------------------- */
 /*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/
diff --git a/osx/osx.h b/osx/osx.h
new file mode 100644
index 0000000..e6d4061
--- /dev/null
+++ b/osx/osx.h
@@ -0,0 +1,3 @@
+/* $scrotwm$ */
+
+long long strtonum(const char *, long long, long long, const char **);
diff --git a/osx/util.h b/osx/util.h
deleted file mode 100644
index e6d4061..0000000
--- a/osx/util.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $scrotwm$ */
-
-long long strtonum(const char *, long long, long long, const char **);
diff --git a/scrotwm.c b/scrotwm.c
index b012389..c071784 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -84,6 +84,10 @@ static const char	*cvstag = "$scrotwm$";
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrandr.h>
 
+#ifdef __OSX__
+#include <osx.h>
+#endif
+
 #if RANDR_MAJOR < 1
 #  error XRandR versions less than 1.0 are not supported
 #endif
-- 
1.7.10.4