summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-01-28 05:56:17 +0000
committerIgor Pashev <pashev.igor@gmail.com>2013-01-28 05:56:17 +0000
commit343c5a5e8c48ac8bad3b68ba9c2d876d67e2c36b (patch)
tree992d5d07ed39036b96cfc85d14aea6bf293bd33b
parente547c34e6daea15ca7fc3299f7f3c86fc838aa21 (diff)
downloadicon-343c5a5e8c48ac8bad3b68ba9c2d876d67e2c36b.tar.gz
undef SHARED
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/undefine-SHARED-if-defined.patch16
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 17bce2a..c524d3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
debian-9.4.3-2.patch
config-illumos.patch
+undefine-SHARED-if-defined.patch
diff --git a/debian/patches/undefine-SHARED-if-defined.patch b/debian/patches/undefine-SHARED-if-defined.patch
new file mode 100644
index 0000000..ffe84ae
--- /dev/null
+++ b/debian/patches/undefine-SHARED-if-defined.patch
@@ -0,0 +1,16 @@
+Description: SHARED may be defined in sys/mman.h
+ Better solution might be proper CFLAGS
+Index: icon/src/h/xwin.h
+===================================================================
+--- icon.orig/src/h/xwin.h 2002-09-13 21:04:32.000000000 +0000
++++ icon/src/h/xwin.h 2013-01-28 05:41:14.988907554 +0000
+@@ -74,6 +74,9 @@
+ #define WMAXCOLORS 256
+ #define MAXCOLORNAME 40
+ #define MAXDISPLAYNAME 64
++#ifdef SHARED
++#undef SHARED
++#endif
+ #define SHARED 0
+ #define MUTABLE 1
+ #define NUMCURSORSYMS 78