Fix a few macros for Apple

1 files changed, 5 insertions, 105 deletions

diff --git a/cmake/config.h.in b/cmake/config.h.in
index 55c8fa9..187d6fb 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -3,157 +3,104 @@
 
 #cmakedefine HAVE_SNPRINTF
 
-/* Define to 1 if compiler supports __builtin_stack_pointer */
 #cmakedefine HAVE_BUILTIN_STACK_POINTER
 
-/* Define to 1 if you have the <conflict-signal.h> header file. */
 #cmakedefine HAVE_CONFLICT_SIGNAL_H
 
-/* Define to 1 if you have the <cygwin/signal.h> header file. */
 #cmakedefine HAVE_CYGWIN_SIGNAL_H
 
-/* Define to 1 if you have the declaration of `cfree', and to 0 if you don't.
-   */
 #cmakedefine01 HAVE_DECL_CFREE
 
-/* Define to 1 if you have the declaration of `memalign', and to 0 if you
-   don't. */
 #cmakedefine01 HAVE_DECL_MEMALIGN
 
-/* Define to 1 if you have the declaration of `posix_memalign', and to 0 if
-   you don't. */
 #cmakedefine01 HAVE_DECL_POSIX_MEMALIGN
 
-/* Define to 1 if you have the declaration of `pvalloc', and to 0 if you
-   don't. */
 #cmakedefine01 HAVE_DECL_PVALLOC
 
-/* Define to 1 if you have the declaration of `uname', and to 0 if you don't.
-   */
 #cmakedefine01 HAVE_DECL_UNAME
 
-/* Define to 1 if you have the declaration of `valloc', and to 0 if you don't.
-   */
 #cmakedefine01 HAVE_DECL_VALLOC
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
 #cmakedefine HAVE_DLFCN_H
 
-/* Define to 1 if the system has the type `Elf32_Versym'. */
 #cmakedefine HAVE_ELF32_VERSYM
 
-/* Define to 1 if you have the <execinfo.h> header file. */
 #cmakedefine HAVE_EXECINFO_H
 
-/* Define to 1 if you have the <fcntl.h> header file. */
 #cmakedefine HAVE_FCNTL_H
 
-/* Define to 1 if you have the <features.h> header file. */
 #cmakedefine HAVE_FEATURES_H
 
-/* Define to 1 if you have the `geteuid' function. */
 #cmakedefine HAVE_GETEUID
 
-/* Define to 1 if you have the `getpagesize' function. */
 #cmakedefine HAVE_GETPAGESIZE
 
-/* Define to 1 if you have the <glob.h> header file. */
 #cmakedefine HAVE_GLOB_H
 
-/* Define to 1 if you have the <grp.h> header file. */
 #cmakedefine HAVE_GRP_H
 
-/* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <libunwind.h> header file. */
 #cmakedefine01 HAVE_LIBUNWIND_H
 
-/* Define to 1 if you have the <linux/ptrace.h> header file. */
 #cmakedefine HAVE_LINUX_PTRACE_H
 
-/* Define to 1 if you have the <malloc.h> header file. */
 #cmakedefine HAVE_MALLOC_H
 
-/* Define to 1 if you have the <malloc/malloc.h> header file. */
 #cmakedefine HAVE_MALLOC_MALLOC_H
 
-/* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H
 
-/* Define to 1 if you have a working `mmap' system call. */
 #cmakedefine HAVE_MMAP
 
-/* define if the compiler implements namespaces */
 #cmakedefine HAVE_NAMESPACES
 
-/* Define to 1 if you have the <poll.h> header file. */
 #cmakedefine HAVE_POLL_H
 
-/* define if libc has program_invocation_name */
 #cmakedefine HAVE_PROGRAM_INVOCATION_NAME
 
-/* Define if you have POSIX threads libraries and header files. */
 #cmakedefine HAVE_PTHREAD
 
-/* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H
 
-/* Define to 1 if you have the `sbrk' function. */
 #cmakedefine HAVE_SBRK
 
-/* Define to 1 if you have the <sched.h> header file. */
+#cmakedefine HAVE_FORK
+
 #cmakedefine HAVE_SCHED_H
 
-/* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine HAVE_STDLIB_H 1
 
-/* Define to 1 if you have the <strings.h> header file. */
 #cmakedefine HAVE_STRINGS_H
 
-/* Define to 1 if you have the <string.h> header file. */
 #cmakedefine HAVE_STRING_H
 
-/* Define to 1 if the system has the type `struct mallinfo'. */
-#cmakedefine01 HAVE_STRUCT_MALLINFO
+#cmakedefine HAVE_STRUCT_MALLINFO
 
-/* Define to 1 if you have the <sys/cdefs.h> header file. */
 #cmakedefine HAVE_SYS_CDEFS_H
 
-/* Define to 1 if you have the <sys/malloc.h> header file. */
 #cmakedefine HAVE_SYS_MALLOC_H
 
-/* Define to 1 if you have the <sys/param.h> header file. */
 #cmakedefine HAVE_SYS_PARAM_H
 
-/* Define to 1 if you have the <sys/prctl.h> header file. */
 #cmakedefine HAVE_SYS_PRCTL_H
 
-/* Define to 1 if you have the <sys/resource.h> header file. */
 #cmakedefine HAVE_SYS_RESOURCE_H
 
-/* Define to 1 if you have the <sys/socket.h> header file. */
 #cmakedefine HAVE_SYS_SOCKET_H
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
 #cmakedefine HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/syscall.h> header file. */
 #cmakedefine HAVE_SYS_SYSCALL_H
 
-/* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H
 
-/* <sys/ucontext.h> is broken on redhat 7 */
 #cmakedefine HAVE_SYS_UCONTEXT_H
 
-/* Define to 1 if you have the <sys/wait.h> header file. */
 #cmakedefine HAVE_SYS_WAIT_H
 
-/* Define to 1 if compiler supports __thread */
 #cmakedefine HAVE_TLS
 
 #cmakedefine01 HAVE_DECL_SLEEP
@@ -164,76 +111,50 @@
 
 #cmakedefine HAVE_UNWIND_BACKTRACE
 
-/* Define to 1 if you have the <ucontext.h> header file. */
 #cmakedefine HAVE_UCONTEXT_H
 
-/* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H
 
-/* Define to 1 if you have the <unwind.h> header file. */
 #cmakedefine HAVE_UNWIND_H
 
-/* Define to 1 if you have the <valgrind.h> header file. */
 #cmakedefine HAVE_VALGRIND_H
 
-/* define if your compiler has __attribute__ */
 #cmakedefine HAVE___ATTRIBUTE__
 
-/* Define to 1 if compiler supports __environ */
 #cmakedefine HAVE___ENVIRON
 
-/* Define to 1 if the system has the type `__int64'. */
 #cmakedefine HAVE___INT64
 
-/* prefix where we look for installed files */
 #cmakedefine INSTALL_PREFIX
 
-/* Define to 1 if int32_t is equivalent to intptr_t */
 #cmakedefine INT32_EQUALS_INTPTR
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries. */
 #cmakedefine LT_OBJDIR
 
-/* Define to 'volatile' if __malloc_hook is declared volatile */
 #cmakedefine MALLOC_HOOK_MAYBE_VOLATILE
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
-/* Name of package */
 #define PACKAGE "@PROJECT_NAME@"
 
-/* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "gperftools@googlegroups.com"
 
-/* Define to the full name of this package. */
 #define PACKAGE_NAME "@PROJECT_NAME@"
 
-/* Define to the full name and version of this package. */
 #define PACKAGE_STRING "@PROJECT_NAME@ @PROJECT_VERSION@"
 
-/* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "@PROJECT_NAME@"
 
-/* Define to the home page for this package. */
 #cmakedefine PACKAGE_URL
 
-/* Define to the version of this package. */
 #define PACKAGE_VERSION "@PROJECT_VERSION@"
 
-/* How to access the PC from a struct ucontext */
 #define PC_FROM_UCONTEXT @PC_FROM_UCONTEXT_DEF@
 
-/* Always the empty-string on non-windows systems. On windows, should be
-   "__declspec(dllexport)". This way, when we compile the dll, we export our
-   functions/classes. It's safe to define this here because config.h is only
-   used internally, to compile the DLL, and every DLL source file #includes
-   "config.h" before anything else. */
 #cmakedefine WIN32
 #if defined(WIN32)
 #ifndef PERFTOOLS_DLL_DECL
-# define PERFTOOLS_IS_A_DLL  1   /* not set if you're statically linking */
-# define PERFTOOLS_DLL_DECL  __declspec(dllexport)
+# define PERFTOOLS_IS_A_DLL  1   # define PERFTOOLS_DLL_DECL  __declspec(dllexport)
 # define PERFTOOLS_DLL_DECL_FOR_UNITTESTS  __declspec(dllimport)
 #endif
 #else
@@ -243,59 +164,38 @@
 #endif
 #endif
 
-/* printf format code for printing a size_t and ssize_t */
 #define PRIdS  "Id"
 
-/* printf format code for printing a size_t and ssize_t */
 #define PRIuS  "Iu"
 
-/* printf format code for printing a size_t and ssize_t */
 #define PRIxS  "Ix"
 
-/* Mark the systems where we know it's bad if pthreads runs too
-   early before main (before threads are initialized, presumably).  */
 #cmakedefine PTHREADS_CRASHES_IF_RUN_TOO_EARLY
 
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
 #define PTHREAD_CREATE_JOINABLE @PTHREAD_CREATE_JOINABLE@
 
-/* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
-/* the namespace where STL code like vector<> is defined */
 #define STL_NAMESPACE @STL_NAMESPACE@
 
-/* Version number of package */
 #define VERSION @PROJECT_VERSION@
 
-/* C99 says: define this to get the PRI... macros from stdint.h */
 #ifndef __STDC_FORMAT_MACROS
 # define __STDC_FORMAT_MACROS 1
 #endif
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #define inline @inline@
 #endif
 
 #if defined(WIN32)
 
-// ---------------------------------------------------------------------
-// Extra stuff not found in config.h.in
-
-// This must be defined before the windows.h is included.  We need at
-// least 0x0400 for mutex.h to have access to TryLock, and at least
-// 0x0501 for patch_functions.cc to have access to GetModuleHandleEx.
-// (This latter is an optimization we could take out if need be.)
 #ifndef _WIN32_WINNT
 # define _WIN32_WINNT 0x0501
 #endif
 
 #define NO_HEAP_CHECK 1
 
-// TODO(csilvers): include windows/port.h in every relevant source file instead?
 #include "windows/port.h"
 
 #endif
@@ -304,4 +204,4 @@
 #include "windows/mingw.h"
 #endif
 
-#endif  /* #ifndef GPERFTOOLS_CONFIG_H_ */
+#endif