diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /include/prex.h | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/prex.h')
| -rw-r--r-- | include/prex.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/prex.h b/include/prex.h index 7b1a3574fb70..a7db2bdc1100 100644 --- a/include/prex.h +++ b/include/prex.h @@ -29,9 +29,6 @@ */ #define Icon HIDE_XLIB_Icon -/* Types from <X11/X.h> that clash, but we do use. */ -#define Time XLIB_Time - #if defined __cplusplus extern "C" { #endif |