diff options
| author | Ralf Nolden <nolden@kde.org> | 2016-05-28 13:54:36 +0200 |
|---|---|---|
| committer | Ralf Nolden <nolden@kde.org> | 2016-06-09 15:44:30 +0000 |
| commit | 2c87670f4783b7d321bbe31c33d2545597e7bd43 (patch) | |
| tree | 4927acfd8e87216e305a7e05018cbf7b67c9c8e1 | |
| parent | 14fd7741ef54a23abeb63a623217b179699f7535 (diff) | |
| download | qttools-2c87670f4783b7d321bbe31c33d2545597e7bd43.tar.gz | |
OpenBSD: Compile fix for <sys/timeb.h> include
OpenBSD removed the <sys/timeb.h> include from the OS with version 5.5.
Since them, compiling fails for clucene because of the predefined
availability of <sys/timeb.h> in qclucene-config_p.h. #ifdef the define
for timeb.h with !defined(__OpenBSD__) to avoid compile errors.
See hint in http://www.openbsd.org/faq/upgrade55.html
Change-Id: Ic4f787bed90a667d5e1c6fb28ea891585fcf08a4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | src/assistant/clucene/qclucene-config_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/assistant/clucene/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h index 98c4b6ce3..e53b63725 100644 --- a/src/assistant/clucene/qclucene-config_p.h +++ b/src/assistant/clucene/qclucene-config_p.h @@ -305,8 +305,10 @@ configure. #endif /* Define to 1 if you have the <sys/timeb.h> header file. */ -#ifndef _CL_HAVE_SYS_TIMEB_H -#define _CL_HAVE_SYS_TIMEB_H 1 +#if !defined(__OpenBSD__) +# ifndef _CL_HAVE_SYS_TIMEB_H +# define _CL_HAVE_SYS_TIMEB_H 1 +# endif #endif /* Define to 1 if you have the <sys/types.h> header file. */ |