Update two header files

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
ropensci · Dec 15, 2017 · 3544039 · 3544039
1 parent cdf8283
commit 3544039
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/libgit2/src/common.h b/src/libgit2/src/common.h
@@ -43,7 +43,7 @@
 # include <winsock2.h>
 # include <windows.h>
 # include <ws2tcpip.h>
-/* # include "win32/msvc-compat.h" */
+# include "win32/msvc-compat.h"
 # include "win32/mingw-compat.h"
 # include "win32/win32-compat.h"
 # include "win32/error.h"

diff --git a/src/libgit2/src/config.c b/src/libgit2/src/config.c
@@ -629,14 +629,7 @@ int git_config_delete_entry(git_config *cfg, const char *name)
 int git_config_set_int64(git_config *cfg, const char *name, int64_t value)
 {
 	char str_value[32]; /* All numbers should fit in here */
-#ifdef _WIN32
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-extra-args"
 	p_snprintf(str_value, sizeof(str_value), "%" PRId64, value);
-#pragma GCC diagnostic pop
-#else
-	p_snprintf(str_value, sizeof(str_value), "%" PRId64, value);
-#endif
 	return git_config_set_string(cfg, name, str_value);
 }