From 2ac205d1d0aaff43513471b0e185b8a9a2487d9a Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 14 Sep 2017 16:23:05 +0300
Subject: Unconditionally add -DPKGCONFIG_IS_STATIC to cc.export.poptions for
 static library

---
 libpkgconf/buildfile    | 13 ++++++-------
 libpkgconf/libpkgconf.h |  7 ++++---
 libpkgconf/stdinc.h     | 15 ++++++++-------
 libpkgconf/version.h.in |  4 ++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/libpkgconf/buildfile b/libpkgconf/buildfile
index 7d0399d..e146d02 100644
--- a/libpkgconf/buildfile
+++ b/libpkgconf/buildfile
@@ -73,14 +73,13 @@ if ($c.target.class == "windows")
 
 c.poptions =+ "-I$out_root" "-I$src_root"
 
-lib{pkgconf}: cc.export.poptions = "-I$src_root"
+lib{pkgconf}:  cc.export.poptions = "-I$src_root"
+liba{pkgconf}: cc.export.poptions += -DPKGCONFIG_IS_STATIC
 
-if ($c.target.class == "windows")
-  liba{pkgconf}: cc.export.poptions += -DPKGCONFIG_IS_STATIC
-else
-  # The macro definition is moved from stdinc.h. See the corresponding comment
-  # there for more details.
-  #
+# The macro definition is moved from stdinc.h. See the corresponding comment
+# there for more details.
+#
+if ($c.target.class != "windows")
   obj{client fragment path pkg queue tuple}: c.poptions += -D_GNU_SOURCE
 
 # Install into the pkgconf/libpkgconf/ subdirectory of, say, /usr/include/.
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index 370bf9a..096d92b 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -16,9 +16,10 @@
 #ifndef LIBPKGCONF__LIBPKGCONF_H
 #define LIBPKGCONF__LIBPKGCONF_H
 
-// Wrap the header content into the 'extern "C"' block, so C++ compiler can
-// handle it properly (issue #136 is reported).
-//
+/*
+ * Wrap the header content into the 'extern "C"' block, so C++ compiler can
+ * handle it properly (issue #136 is reported).
+ */
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h
index 5e22098..c373a9a 100644
--- a/libpkgconf/stdinc.h
+++ b/libpkgconf/stdinc.h
@@ -16,12 +16,13 @@
 #ifndef __STDINC_H
 #define __STDINC_H
 
-// The problem is that g++ defines this macro by default (in contrast to gcc)
-// causing the "redefined macro" warning when this header is (implicitly)
-// included into the C++ source file (issue #135 is reported). So we move this
-// definition into the buildfile,
-//
-//#define _GNU_SOURCE
+/*
+ * The problem is that g++ defines this macro by default (in contrast to gcc)
+ * causing the "redefined macro" warning when this header is (implicitly)
+ * included into the C++ source file (issue #135 is reported). So we move this
+ * definition into the buildfile,
+ */
+/* #define _GNU_SOURCE */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -41,7 +42,7 @@
  * #137 is reported).
  */
 # ifndef NOMINMAX
-#  define NOMINMAX // No min and max macros.
+#  define NOMINMAX /* No min and max macros. */
 # endif
 
 # include <windows.h>
diff --git a/libpkgconf/version.h.in b/libpkgconf/version.h.in
index 1ca0111..0a41573 100644
--- a/libpkgconf/version.h.in
+++ b/libpkgconf/version.h.in
@@ -3,8 +3,8 @@
  * license   : ISC; see accompanying COPYING file
  */
 
-#ifndef PACKAGE_VERSION // Note: using the version macro itself.
+#ifndef PACKAGE_VERSION /* Note: using the version macro itself. */
 
 #define PACKAGE_VERSION "$libpkgconf.version.project_id$"
 
-#endif // PACKAGE_VERSION
+#endif /* PACKAGE_VERSION */
-- 
cgit v1.1