From 515cd487de1f2d896757cba0cafcccaae2561779 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 12 Apr 2016 11:19:06 +0800 Subject: [PATCH] cmake: config-h.in.cmake: avoid redefinition warnings when compiling python bindings, the included "pyconfig.h" also defines some of the macros which are duplicated with our versions in acconfig.h. so do not define them if they are already defined. Signed-off-by: Kefu Chai --- src/include/config-h.in.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index 059e0a24d73..e908e85f43b 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -174,16 +174,22 @@ #cmakedefine HAVE_SYS_VFS_H 1 /* Define to 1 if you have that is POSIX.1 compatible. */ +#ifndef HAVE_SYS_WAIT_H #cmakedefine HAVE_SYS_WAIT_H +#endif /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_XATTR_H +#ifndef HAVE_UNISTD_H /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H +#endif +#ifndef HAVE_UTIME_H /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UTIME_H +#endif /* Define if you have the header file. */ #cmakedefine HAVE_EXECINFO_H -- 2.47.3