Attachment 114031 Details for Bug 85418 – Keep cmake generated defines for include files in sync with autotools

[patch] Keep cmake generated defines for include files in sync with autotools

0003-Keep-cmake-generated-defines-for-include-files-in-sync.txt (text/plain), 3.28 KB, created by Ralf Habacker on 2015-03-05 12:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-05 12:50:09 UTC

Size: 3.28 KB

patch

obsolete

>From ce7070613226e63ab3737c1c7635d97efa40bee1 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 5 Mar 2015 13:07:55 +0100
>Subject: [PATCH 3/3] Keep cmake generated defines for include files in sync
> with autotools.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85418
>---
> cmake/config.h.cmake | 74 +++++++++++++++++++++++++++++++++++-----------------
> 1 file changed, 50 insertions(+), 24 deletions(-)
>
>diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
>index 88c2caa..afbacdc 100644
>--- a/cmake/config.h.cmake
>+++ b/cmake/config.h.cmake
>@@ -101,53 +101,79 @@
> #cmakedefine GLIB_VERSION_MAX_ALLOWED  @GLIB_VERSION_MAX_ALLOWED@
> 
> // headers
>+#cmakedefine HAVE_ALLOCA_H
>+#cmakedefine HAVE_BYTESWAP_H
>+#cmakedefine HAVE_CRT_EXTERNS_H
>+
> /* Define to 1 if you have dirent.h */
> #cmakedefine   HAVE_DIRENT_H 1
> 
>-/* Define to 1 if you have io.h */
>-#cmakedefine   HAVE_IO_H 1
>+#cmakedefine HAVE_DLFCN_H
>+
>+/* Define to 1 if you have errno.h */
>+#cmakedefine   HAVE_ERRNO_H 1
>+
>+#cmakedefine HAVE_EXECINFO_H
>+#cmakedefine HAVE_EXPAT_H
> 
> /* Define to 1 if you have grp.h */
> #cmakedefine   HAVE_GRP_H 1
> 
>-/* Define to 1 if you have sys/poll.h */
>-#cmakedefine    HAVE_POLL 1
>+/* Define to 1 if you have inttypes.h */
>+#cmakedefine   HAVE_INTTYPES_H 1
> 
>-/* Define to 1 if you have sys/time.h */
>-#cmakedefine    HAVE_SYS_TIME 1
>+/* Define to 1 if you have io.h */
>+#cmakedefine   HAVE_IO_H 1
> 
>-/* Define to 1 if you have sys/wait.h */
>-#cmakedefine    HAVE_SYS_WAIT 1
>+/* Define to 1 if you have locale.h */
>+#cmakedefine   HAVE_LOCALE_H 1
> 
>-/* Define to 1 if you have time.h */
>-#cmakedefine   HAVE_TIME_H 1
>+#cmakedefine HAVE_MEMORY_H
> 
>-/* Define to 1 if you have ws2tcpip.h */
>-#cmakedefine   HAVE_WS2TCPIP_H
>+/* Define to 1 if you have sys/poll.h */
>+#cmakedefine    HAVE_POLL 1
> 
>-/* Define to 1 if you have unistd.h */
>-#cmakedefine   HAVE_UNISTD_H 1
>+/* Define to 1 if you have signal.h */
>+#cmakedefine   HAVE_SIGNAL_H 1
>+
>+/* Define to 1 if you have stdint.h */
>+#cmakedefine   HAVE_STDINT_H 1
>+
>+#cmakedefine HAVE_STDLIB_H
> 
> /* Define to 1 if you have stdio.h */
> #cmakedefine   HAVE_STDIO_H 1
> 
>+#cmakedefine HAVE_STRINGS_H
>+#cmakedefine HAVE_STRING_H
>+#cmakedefine HAVE_SYSLOG_H
>+#cmakedefine HAVE_SYS_EVENTS_H
>+#cmakedefine HAVE_SYS_INOTIFY_H
>+#cmakedefine HAVE_SYS_PRCTL_H
>+#cmakedefine HAVE_SYS_RESOURCE_H
>+#cmakedefine HAVE_SYS_STAT_H
>+
> /* Define to 1 if you have sys/syslimits.h */
> #cmakedefine   HAVE_SYS_SYSLIMITS_H 1
> 
>-/* Define to 1 if you have errno.h */
>-#cmakedefine   HAVE_ERRNO_H 1
>+/* Define to 1 if you have sys/time.h */
>+#cmakedefine    HAVE_SYS_TIME_H 1
> 
>-/* Define to 1 if you have signal.h */
>-#cmakedefine   HAVE_SIGNAL_H 1
>+#cmakedefine HAVE_SYS_TYPES_H
> 
>-/* Define to 1 if you have locale.h */
>-#cmakedefine   HAVE_LOCALE_H 1
>+#cmakedefine HAVE_SYS_UIO_H
> 
>-/* Define to 1 if you have inttypes.h */
>-#cmakedefine   HAVE_INTTYPES_H 1
>+/* Define to 1 if you have sys/wait.h */
>+#cmakedefine    HAVE_SYS_WAIT_H 1
> 
>-/* Define to 1 if you have stdint.h */
>-#cmakedefine   HAVE_STDINT_H 1
>+/* Define to 1 if you have time.h */
>+#cmakedefine   HAVE_TIME_H 1
>+
>+/* Define to 1 if you have ws2tcpip.h */
>+#cmakedefine   HAVE_WS2TCPIP_H
>+
>+/* Define to 1 if you have unistd.h */
>+#cmakedefine   HAVE_UNISTD_H 1
> 
> // symbols
> /* Define to 1 if you have backtrace */
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 85418: 108368 | 108369 | 114020 | 114021 | 114029 | 114030 | 114031 | 114040

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.