include/postx.h | 3 --- include/prex.h | 5 ----- 2 files changed, 8 deletions(-)
New commits: commit 7bacb89bb955f4985e435c33dde629099dab744b Author: Noel Grandin <[email protected]> Date: Tue Sep 30 15:00:56 2014 +0200 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 <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/include/postx.h b/include/postx.h index 195786f..ec0b826 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 a7db2bd..9bc86fb 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
