Karlson2k: Fix win32 cURL tests

This commit is contained in:
Christian Grothoff
2014-02-04 13:51:06 +00:00
parent 0d8aeae6df
commit 8251a574fb
4 changed files with 13 additions and 1 deletions
+1 -1
View File
@@ -225,7 +225,7 @@ AC_SUBST(PTHREAD_CPPFLAGS)
AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h sys/types.h pthread.h],,AC_MSG_ERROR([Compiling libmicrohttpd requires standard UNIX headers files]))
# Check for optional headers
AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h winsock2.h ws2tcpip.h])
AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h winsock2.h ws2tcpip.h gcrypt.h])
AC_CHECK_HEADERS([search.h], AM_CONDITIONAL(HAVE_TSEARCH, true), AM_CONDITIONAL(HAVE_TSEARCH, false))
+4
View File
@@ -31,7 +31,9 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#ifdef HAVE_GCRYPT_H
#include <gcrypt.h>
#endif
#ifndef WINDOWS
#include <sys/socket.h>
@@ -229,10 +231,12 @@ main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
#ifdef HAVE_GCRYPT_H
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
#endif
if (0 != curl_global_init (CURL_GLOBAL_WIN32))
return 2;
errorCount += testDigestAuth ();
@@ -30,7 +30,9 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#ifdef HAVE_GCRYPT_H
#include <gcrypt.h>
#endif
#ifndef WINDOWS
#include <sys/socket.h>
@@ -227,9 +229,11 @@ main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
#ifdef HAVE_GCRYPT_H
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
#endif
if (0 != curl_global_init (CURL_GLOBAL_WIN32))
return 2;
+4
View File
@@ -31,7 +31,9 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#ifdef HAVE_GCRYPT_H
#include <gcrypt.h>
#endif
#ifndef WINDOWS
#include <unistd.h>
@@ -468,9 +470,11 @@ main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
#ifdef HAVE_GCRYPT_H
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
#ifdef GCRYCTL_INITIALIZATION_FINISHED
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
#endif
oneone = NULL != strstr (argv[0], "11");
if (0 != curl_global_init (CURL_GLOBAL_WIN32))