From d58ee49553e26607ea42e1156277daed3af7ea34 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Tue, 30 Jun 2020 11:50:36 +0200 Subject: sigc++config.h.* Format with clang-format (clang-format-10) So the generated sigc++config.h will have the correct formatting. --- sigc++config.h.in | 46 +++++++++++++++++++++++----------------------- sigc++config.h.meson | 46 +++++++++++++++++++++++----------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/sigc++config.h.in b/sigc++config.h.in index 8d82457..a82a86b 100644 --- a/sigc++config.h.in +++ b/sigc++config.h.in @@ -13,20 +13,20 @@ /* Detect Win32 platform */ #ifdef _WIN32 -# if defined(_MSC_VER) -# define SIGC_MSC 1 -# define SIGC_WIN32 1 -# define SIGC_DLL 1 -# elif defined(__CYGWIN__) -# define SIGC_CONFIGURE 1 -# elif defined(__MINGW32__) -# define SIGC_WIN32 1 -# define SIGC_CONFIGURE 1 -# else -# error "libsigc++ config: Unknown win32 architecture (send me gcc --dumpspecs or equiv)" -# endif +#if defined(_MSC_VER) +#define SIGC_MSC 1 +#define SIGC_WIN32 1 +#define SIGC_DLL 1 +#elif defined(__CYGWIN__) +#define SIGC_CONFIGURE 1 +#elif defined(__MINGW32__) +#define SIGC_WIN32 1 +#define SIGC_CONFIGURE 1 +#else +#error "libsigc++ config: Unknown win32 architecture (send me gcc --dumpspecs or equiv)" +#endif #else /* !_WIN32 */ -# define SIGC_CONFIGURE 1 +#define SIGC_CONFIGURE 1 #endif /* !_WIN32 */ #ifdef SIGC_MSC @@ -42,9 +42,9 @@ * seems to have no adverse effects, so that seems like a good enough * solution for now. */ -# pragma warning(disable:4251) +#pragma warning(disable : 4251) -#if (_MSC_VER < 1900) && !defined (noexcept) +#if (_MSC_VER < 1900) && !defined(noexcept) #define _ALLOW_KEYWORD_MACROS 1 #define noexcept _NOEXCEPT #endif @@ -54,13 +54,13 @@ #endif /* !SIGC_MSC */ #ifdef SIGC_DLL -# if defined(SIGC_BUILD) && defined(_WINDLL) -# define SIGC_API __declspec(dllexport) -# elif !defined(SIGC_BUILD) -# define SIGC_API __declspec(dllimport) -# else -# define SIGC_API -# endif +#if defined(SIGC_BUILD) && defined(_WINDLL) +#define SIGC_API __declspec(dllexport) +#elif !defined(SIGC_BUILD) +#define SIGC_API __declspec(dllimport) +#else +#define SIGC_API +#endif #else /* !SIGC_DLL */ -# define SIGC_API +#define SIGC_API #endif /* !SIGC_DLL */ diff --git a/sigc++config.h.meson b/sigc++config.h.meson index 913660d..47cbd80 100644 --- a/sigc++config.h.meson +++ b/sigc++config.h.meson @@ -16,20 +16,20 @@ /* Detect Win32 platform */ #ifdef _WIN32 -# if defined(_MSC_VER) -# define SIGC_MSC 1 -# define SIGC_WIN32 1 -# define SIGC_DLL 1 -# elif defined(__CYGWIN__) -# define SIGC_CONFIGURE 1 -# elif defined(__MINGW32__) -# define SIGC_WIN32 1 -# define SIGC_CONFIGURE 1 -# else -# error "libsigc++ config: Unknown win32 architecture (send me gcc --dumpspecs or equiv)" -# endif +#if defined(_MSC_VER) +#define SIGC_MSC 1 +#define SIGC_WIN32 1 +#define SIGC_DLL 1 +#elif defined(__CYGWIN__) +#define SIGC_CONFIGURE 1 +#elif defined(__MINGW32__) +#define SIGC_WIN32 1 +#define SIGC_CONFIGURE 1 +#else +#error "libsigc++ config: Unknown win32 architecture (send me gcc --dumpspecs or equiv)" +#endif #else /* !_WIN32 */ -# define SIGC_CONFIGURE 1 +#define SIGC_CONFIGURE 1 #endif /* !_WIN32 */ #ifdef SIGC_MSC @@ -45,9 +45,9 @@ * seems to have no adverse effects, so that seems like a good enough * solution for now. */ -# pragma warning(disable:4251) +#pragma warning(disable : 4251) -#if (_MSC_VER < 1900) && !defined (noexcept) +#if (_MSC_VER < 1900) && !defined(noexcept) #define _ALLOW_KEYWORD_MACROS 1 #define noexcept _NOEXCEPT #endif @@ -57,15 +57,15 @@ #endif /* !SIGC_MSC */ #ifdef SIGC_DLL -# if defined(SIGC_BUILD) && defined(_WINDLL) -# define SIGC_API __declspec(dllexport) -# elif !defined(SIGC_BUILD) -# define SIGC_API __declspec(dllimport) -# else -# define SIGC_API -# endif +#if defined(SIGC_BUILD) && defined(_WINDLL) +#define SIGC_API __declspec(dllexport) +#elif !defined(SIGC_BUILD) +#define SIGC_API __declspec(dllimport) +#else +#define SIGC_API +#endif #else /* !SIGC_DLL */ -# define SIGC_API +#define SIGC_API #endif /* !SIGC_DLL */ #endif /* !SIGCXXCONFIG_H_INCLUDED */ -- cgit v1.2.1