mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-10 19:19:01 +08:00
83f9a6c469
* [libtasn1] add Windows support * [libtasn1] Supply absolute paths to standard headers in MSVC * [libgpg-error] only apply MSVC patch on Windows * [libtasn1] fix ar-lib issue * [libtasn1] fix #include in sys_types.h as well * [libtasn1] fix Windows builds * [libtasn1] update to 4.17 * [libtasn1] fail x64-windows-static-md builds for now * [libtasn1] update versions * [libtasn1] wrap paths in double quotes * [libtasn1] update versions Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
87 lines
1.7 KiB
Diff
87 lines
1.7 KiB
Diff
diff --git a/src/asn1Coding.c b/src/asn1Coding.c
|
|
index 86c1d07..6fcfc4d 100644
|
|
--- a/src/asn1Coding.c
|
|
+++ b/src/asn1Coding.c
|
|
@@ -23,7 +23,12 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
+#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
+#endif
|
|
+#ifdef _MSC_VER
|
|
+#include <io.h>
|
|
+#endif
|
|
#include <getopt.h>
|
|
#include <assert.h>
|
|
|
|
diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
|
|
index c6f192e..3e4e21d 100644
|
|
--- a/src/asn1Decoding.c
|
|
+++ b/src/asn1Decoding.c
|
|
@@ -23,7 +23,12 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
+#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
+#endif
|
|
+#ifdef _MSC_VER
|
|
+#include <io.h>
|
|
+#endif
|
|
#include <getopt.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
diff --git a/src/asn1Parser.c b/src/asn1Parser.c
|
|
index b6844a8..445c716 100644
|
|
--- a/src/asn1Parser.c
|
|
+++ b/src/asn1Parser.c
|
|
@@ -23,7 +23,12 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
+#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
+#endif
|
|
+#ifdef _MSC_VER
|
|
+#include <io.h>
|
|
+#endif
|
|
#include <getopt.h>
|
|
#include <assert.h>
|
|
|
|
diff --git a/src/benchmark.c b/src/benchmark.c
|
|
index 010d58e..6c613df 100644
|
|
--- a/src/benchmark.c
|
|
+++ b/src/benchmark.c
|
|
@@ -21,9 +21,16 @@
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
+#ifndef _MSC_VER
|
|
#include <sys/time.h>
|
|
+#endif
|
|
#include <time.h>
|
|
+#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
+#endif
|
|
+#ifdef _MSC_VER
|
|
+#include <io.h>
|
|
+#endif
|
|
#include "benchmark.h"
|
|
|
|
int benchmark_must_finish = 0;
|
|
diff --git a/src/benchmark.h b/src/benchmark.h
|
|
index 3272649..6b6bf32 100644
|
|
--- a/src/benchmark.h
|
|
+++ b/src/benchmark.h
|
|
@@ -21,7 +21,9 @@
|
|
# define BENCHMARK_H
|
|
|
|
#include <config.h>
|
|
+#ifndef _MSC_VER
|
|
#include <sys/time.h>
|
|
+#endif
|
|
#include <time.h>
|
|
#include <signal.h>
|
|
#if defined _WIN32
|