summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-30 15:00:56 +0200
committerNoel Grandin <noelgrandin@gmail.com>2014-10-01 08:59:41 +0000
commit7bacb89bb955f4985e435c33dde629099dab744b (patch)
treef816b1bcc256e75a9a8471c9ca3f79bd2ca36750
parent709a62f9b2d49ea596b8308429f12dd4f8b6caca (diff)
fdo#82577: Handle Icon
It appears that this became unnecessary at some point Change-Id: I6638d68d1c44162b4aa62224dc03c19c2413180e Reviewed-on: https://gerrit.libreoffice.org/11715 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--include/postx.h3
-rw-r--r--include/prex.h5
2 files changed, 0 insertions, 8 deletions
diff --git a/include/postx.h b/include/postx.h
index 195786fcee85..ec0b826c2c60 100644
--- a/include/postx.h
+++ b/include/postx.h
@@ -24,9 +24,6 @@
}
#endif
-/* X Types */
-#undef Icon
-
#undef Min
#undef Max
#undef DestroyAll
diff --git a/include/prex.h b/include/prex.h
index a7db2bdc1100..9bc86fb74e73 100644
--- a/include/prex.h
+++ b/include/prex.h
@@ -24,11 +24,6 @@
#error No X headers should be included for MACOSX even if they are present in the SDK
#endif
-/* Types from <X11/X.h> that clash with LO's identifiers
- * and we don't need.
- */
-#define Icon HIDE_XLIB_Icon
-
#if defined __cplusplus
extern "C" {
#endif