| Index: third_party/gflags/gen/win/include/private/config.h
|
| diff --git a/third_party/gflags/gen/win/include/private/config.h b/third_party/gflags/gen/win/include/private/config.h
|
| index dcca757e493b05559a919984526e7fc0cf8c1e1b..d541580eab06568493ecc66115f09fb75e0d8e4c 100644
|
| --- a/third_party/gflags/gen/win/include/private/config.h
|
| +++ b/third_party/gflags/gen/win/include/private/config.h
|
| @@ -1,139 +1,112 @@
|
| -/* src/config.h.in. Generated from configure.ac by autoheader. */
|
| -
|
| -/* Sometimes we accidentally #include this config.h instead of the one
|
| - in .. -- this is particularly true for msys/mingw, which uses the
|
| - unix config.h but also runs code in the windows directory.
|
| - */
|
| -#ifdef __MINGW32__
|
| -#include "../config.h"
|
| -#define GOOGLE_GFLAGS_WINDOWS_CONFIG_H_
|
| -#endif
|
| -
|
| -#ifndef GOOGLE_GFLAGS_WINDOWS_CONFIG_H_
|
| -#define GOOGLE_GFLAGS_WINDOWS_CONFIG_H_
|
| -
|
| -/* 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. */
|
| -#ifndef GFLAGS_DLL_DECL
|
| -# define GFLAGS_IS_A_DLL 1 /* not set if you're statically linking */
|
| -# define GFLAGS_DLL_DECL __declspec(dllexport)
|
| -# define GFLAGS_DLL_DECL_FOR_UNITTESTS __declspec(dllimport)
|
| -#endif
|
| -
|
| -/* Namespace for Google classes */
|
| -#define GOOGLE_NAMESPACE ::google
|
| -
|
| -/* Define to 1 if you have the <dlfcn.h> header file. */
|
| -#undef HAVE_DLFCN_H
|
| -
|
| -/* Define to 1 if you have the <fnmatch.h> header file. */
|
| -#undef HAVE_FNMATCH_H
|
| -
|
| -/* Define to 1 if you have the <inttypes.h> header file. */
|
| -#undef HAVE_INTTYPES_H
|
| -
|
| -/* Define to 1 if you have the <memory.h> header file. */
|
| -#undef HAVE_MEMORY_H
|
| +/* Generated from config.h.in during build configuration using CMake. */
|
|
|
| -/* define if the compiler implements namespaces */
|
| -#define HAVE_NAMESPACES 1
|
| +// Note: This header file is only used internally. It is not part of public interface!
|
|
|
| -/* Define if you have POSIX threads libraries and header files. */
|
| -#undef HAVE_PTHREAD
|
| +// ---------------------------------------------------------------------------
|
| +// System checks
|
|
|
| -/* Define to 1 if you have the `putenv' function. */
|
| -#define HAVE_PUTENV 1
|
| +// Define if you build this library for a MS Windows OS.
|
| +#define OS_WINDOWS
|
|
|
| -/* Define to 1 if you have the `setenv' function. */
|
| -#undef HAVE_SETENV
|
| +// Define if you have the <stdint.h> header file.
|
| +#define HAVE_STDINT_H
|
|
|
| -/* Define to 1 if you have the <stdint.h> header file. */
|
| -#undef HAVE_STDINT_H
|
| +// Define if you have the <sys/types.h> header file.
|
| +#define HAVE_SYS_TYPES_H
|
|
|
| -/* Define to 1 if you have the <stdlib.h> header file. */
|
| -#define HAVE_STDLIB_H 1
|
| +// Define if you have the <inttypes.h> header file.
|
| +/* #undef HAVE_INTTYPES_H */
|
|
|
| -/* Define to 1 if you have the <strings.h> header file. */
|
| -#undef HAVE_STRINGS_H
|
| +// Define if you have the <sys/stat.h> header file.
|
| +#define HAVE_SYS_STAT_H
|
|
|
| -/* Define to 1 if you have the <string.h> header file. */
|
| -#define HAVE_STRING_H 1
|
| +// Define if you have the <unistd.h> header file.
|
| +/* #undef HAVE_UNISTD_H */
|
|
|
| -/* Define to 1 if you have the `strtoll' function. */
|
| -#define HAVE_STRTOLL 1
|
| +// Define if you have the <fnmatch.h> header file.
|
| +/* #undef HAVE_FNMATCH_H */
|
|
|
| -/* Define to 1 if you have the `strtoq' function. */
|
| -#define HAVE_STRTOQ 1
|
| +// Define if you have the <shlwapi.h> header file (Windows 2000/XP).
|
| +#define HAVE_SHLWAPI_H
|
|
|
| -/* Define to 1 if you have the <sys/stat.h> header file. */
|
| -#define HAVE_SYS_STAT_H 1
|
| +// Define if you have the strtoll function.
|
| +/* #undef HAVE_STRTOLL */
|
|
|
| -/* Define to 1 if you have the <sys/types.h> header file. */
|
| -#define HAVE_SYS_TYPES_H 1
|
| +// Define if you have the strtoq function.
|
| +/* #undef HAVE_STRTOQ */
|
|
|
| -/* Define to 1 if you have the <unistd.h> header file. */
|
| -#undef HAVE_UNISTD_H
|
| +// Define if you have the <pthread.h> header file.
|
| +/* #undef HAVE_PTHREAD */
|
|
|
| -/* define if your compiler has __attribute__ */
|
| -#undef HAVE___ATTRIBUTE__
|
| +// Define if your pthread library defines the type pthread_rwlock_t
|
| +/* #undef HAVE_RWLOCK */
|
|
|
| -/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
| - */
|
| -#undef LT_OBJDIR
|
| -
|
| -/* Name of package */
|
| -#undef PACKAGE
|
| -
|
| -/* Define to the address where bug reports for this package should be sent. */
|
| -#undef PACKAGE_BUGREPORT
|
| -
|
| -/* Define to the full name of this package. */
|
| -#undef PACKAGE_NAME
|
| -
|
| -/* Define to the full name and version of this package. */
|
| -#undef PACKAGE_STRING
|
| +// gcc requires this to get PRId64, etc.
|
| +#if defined(HAVE_INTTYPES_H) && !defined(__STDC_FORMAT_MACROS)
|
| +# define __STDC_FORMAT_MACROS 1
|
| +#endif
|
|
|
| -/* Define to the one symbol short name of this package. */
|
| -#undef PACKAGE_TARNAME
|
| +// ---------------------------------------------------------------------------
|
| +// Package information
|
|
|
| -/* Define to the home page for this package. */
|
| -#undef PACKAGE_URL
|
| +// Name of package.
|
| +#define PACKAGE gflags
|
|
|
| -/* Define to the version of this package. */
|
| -#undef PACKAGE_VERSION
|
| +// Define to the full name of this package.
|
| +#define PACKAGE_NAME gflags
|
|
|
| -/* Define to necessary symbol if this constant uses a non-standard name on
|
| - your system. */
|
| -#undef PTHREAD_CREATE_JOINABLE
|
| +// Define to the full name and version of this package.
|
| +#define PACKAGE_STRING gflags 2.2.0
|
|
|
| -/* Define to 1 if you have the ANSI C header files. */
|
| -#define STDC_HEADERS 1
|
| +// Define to the one symbol short name of this package.
|
| +#define PACKAGE_TARNAME gflags-2.2.0
|
|
|
| -/* the namespace where STL code like vector<> is defined */
|
| -#define STL_NAMESPACE std
|
| +// Define to the version of this package.
|
| +#define PACKAGE_VERSION 2.2.0
|
|
|
| -/* Version number of package */
|
| -#undef VERSION
|
| +// Version number of package.
|
| +#define VERSION PACKAGE_VERSION
|
|
|
| -/* Stops putting the code inside the Google namespace */
|
| -#define _END_GOOGLE_NAMESPACE_ }
|
| +// Define to the address where bug reports for this package should be sent.
|
| +#define PACKAGE_BUGREPORT https://github.com/schuhschuh/gflags/issues
|
|
|
| -/* Puts following code inside the Google namespace */
|
| -#define _START_GOOGLE_NAMESPACE_ namespace google {
|
| +// ---------------------------------------------------------------------------
|
| +// Path separator
|
| +#ifndef PATH_SEPARATOR
|
| +# ifdef OS_WINDOWS
|
| +# define PATH_SEPARATOR '\\'
|
| +# else
|
| +# define PATH_SEPARATOR '/'
|
| +# endif
|
| +#endif
|
|
|
| -// ---------------------------------------------------------------------
|
| -// Extra stuff not found in config.h.in
|
| +// ---------------------------------------------------------------------------
|
| +// Windows
|
|
|
| -// This must be defined before the windows.h is included. It's needed
|
| -// for mutex.h, to give access to the TryLock method.
|
| -#ifndef _WIN32_WINNT
|
| -# define _WIN32_WINNT 0x0400
|
| +// Whether gflags library is a DLL.
|
| +#ifndef GFLAGS_IS_A_DLL
|
| +# define GFLAGS_IS_A_DLL 0
|
| #endif
|
|
|
| -// TODO(csilvers): include windows/port.h in every relevant source file instead?
|
| -#include "windows/port.h"
|
| +// Always export symbols when compiling a shared library as this file is only
|
| +// included by internal modules when building the gflags library itself.
|
| +// The gflags_declare.h header file will set it to import these symbols otherwise.
|
| +#ifndef GFLAGS_DLL_DECL
|
| +# if GFLAGS_IS_A_DLL && defined(_MSC_VER)
|
| +# define GFLAGS_DLL_DECL __declspec(dllexport)
|
| +# else
|
| +# define GFLAGS_DLL_DECL
|
| +# endif
|
| +#endif
|
| +// Flags defined by the gflags library itself must be exported
|
| +#ifndef GFLAGS_DLL_DEFINE_FLAG
|
| +# define GFLAGS_DLL_DEFINE_FLAG GFLAGS_DLL_DECL
|
| +#endif
|
|
|
| -#endif /* GOOGLE_GFLAGS_WINDOWS_CONFIG_H_ */
|
| +#ifdef OS_WINDOWS
|
| +// The unittests import the symbols of the shared gflags library
|
| +# if GFLAGS_IS_A_DLL && defined(_MSC_VER)
|
| +# define GFLAGS_DLL_DECL_FOR_UNITTESTS __declspec(dllimport)
|
| +# endif
|
| +# include "windows_port.h"
|
| +#endif
|
|
|