From 54fae3a9ca0af5ab29cc02d9c91fc2c63c6bc872 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 19 Sep 2017 21:04:30 +0300
Subject: Merge with latest original package version (master branch)

---
 libpkgconf/stdinc.h | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'libpkgconf/stdinc.h')

diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h
index c373a9a..43d7eeb 100644
--- a/libpkgconf/stdinc.h
+++ b/libpkgconf/stdinc.h
@@ -16,14 +16,6 @@
 #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 */
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,18 +28,14 @@
 
 #ifdef _WIN32
 # define WIN32_LEAN_AND_MEAN
-
-/*
- * Add to avoid clashing of min/max macros with C++ min/max functions (issue
- * #137 is reported).
- */
-# ifndef NOMINMAX
-#  define NOMINMAX /* No min and max macros. */
-# endif
-
 # include <windows.h>
 # include <malloc.h>
 # define PATH_DEV_NULL	"nul"
+# ifdef _WIN64
+#  define SIZE_FMT_SPECIFIER	"%llu"
+# else
+#  define SIZE_FMT_SPECIFIER	"%lu"
+# endif
 # ifndef ssize_t
 # ifndef __MINGW32__
 #  include <BaseTsd.h>
@@ -63,6 +51,7 @@
 # endif
 #else
 # define PATH_DEV_NULL	"/dev/null"
+# define SIZE_FMT_SPECIFIER	"%zu"
 # include <dirent.h>
 # include <unistd.h>
 #endif
-- 
cgit v1.1