all: Build fixes for MSVC.

This is a very old set of changes, implementing better MSVC support.  At
this point I don't know if it's enough; probably there are still more
changes needed to get things to work on MSVC, but it's a big step in the
right direction, and it's better to commit this rather than keep it
lying around forever in my working copy.

Author: lorinder

src/csnip/CMakeLists.txt

@@ -9,6 +9,7 @@ set(CSNIP_CONF__SUPPORT_THREADING ${SUPPORT_THREADING})
 # Check for various types & APIs in libc and provided
 # libraries.
 
+include(CheckIncludeFiles)
 include(CheckSymbolExists)
 include(CheckStructHasMember)
 include(CheckTypeSize)
@@ -34,6 +35,8 @@ endif ()
 
 check_include_file("io.h" CSNIP_CONF__HAVE_IO_H)
 check_include_file("unistd.h" CSNIP_CONF__HAVE_UNISTD_H)
+check_include_file("sys/select.h" CSNIP_CONF__HAVE_SYS_SELECT_H)
+check_include_file("WinSock2.h" CSNIP_CONF__HAVE_WINSOCK2_H)
 
 # Check for symbols
 
@@ -82,7 +85,7 @@ set(CMAKE_REQUIRED_DEFINITIONS
 check_symbol_exists(strerror_r "string.h"
 	CSNIP_CONF__HAVE_STRERROR_R)
 unset(CMAKE_REQUIRED_DEFINITIONS)
-check_symbol_exists(strerror_s "sec_api/string_s.h"
+check_symbol_exists(strerror_s "string.h"
 	CSNIP_CONF__HAVE_STRERROR_S)
 check_symbol_exists(strtok_r "string.h"
 	CSNIP_CONF__HAVE_STRTOK_R)
@@ -91,14 +94,21 @@ check_struct_has_member("struct timespec" tv_sec "time.h"
 check_symbol_exists(timespec_get "time.h"
 	CSNIP_CONF__HAVE_TIMESPEC_GET)
 check_struct_has_member("struct timeval" tv_sec "sys/time.h"
-	CSNIP_CONF__HAVE_TIMEVAL)
+	timeval_in_sys_time)
+check_struct_has_member("struct timeval" tv_sec
+	"WinSock2.h" timeval_in_winsock2)
+if (timeval_in_sys_time OR timeval_in_winsock2)
+	set(CSNIP_CONF__HAVE_TIMEVAL 1)
+endif ()
 check_symbol_exists(writev "sys/uio.h"
 	CSNIP_CONF__HAVE_WRITEV)
 set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
 check_symbol_exists(vasprintf "stdio.h"
 	CSNIP_CONF__HAVE_VASPRINTF)
 unset(CMAKE_REQUIRED_DEFINITIONS)
-
+check_symbol_exists(Sleep "windows.h"
+	CSNIP_CONF__HAVE_WIN32_SLEEP)
+ 
 set(CSNIP_CONF__HAVE_UNLOCKED_STDIO 0)
 if (${CSNIP_CONF__HAVE_FLOCKFILE}
   AND ${CSNIP_CONF__HAVE_FUNLOCKFILE}

src/csnip/csnip_conf.h.in

@@ -43,8 +43,11 @@
 
 #cmakedefine CSNIP_CONF__HAVE_SSIZE_T
 #cmakedefine CSNIP_CONF__HAVE_STDINT_H
+#cmakedefine CSNIP_CONF__HAVE_SYS_SELECT_H
 #cmakedefine CSNIP_CONF__HAVE_SYS_TYPES_H
+#cmakedefine CSNIP_CONF__HAVE_SYS_TIME_H
 #cmakedefine CSNIP_CONF__HAVE_UNISTD_H
+#cmakedefine CSNIP_CONF__HAVE_WINSOCK2_H
 #cmakedefine CSNIP_CONF__HAVE_IO_H
 
 /** Macros for individual libc functions */
@@ -62,6 +65,7 @@
 #cmakedefine CSNIP_CONF__HAVE_GETLINE
 #cmakedefine CSNIP_CONF__HAVE_GETOPT
 #cmakedefine CSNIP_CONF__HAVE_MEMALIGN
+#cmakedefine CSNIP_CONF__HAVE_NANOSLEEP
 #cmakedefine CSNIP_CONF__HAVE_POSIX_MEMALIGN
 #cmakedefine CSNIP_CONF__HAVE_PUTC_UNLOCKED
 #cmakedefine CSNIP_CONF__HAVE_READV
@@ -74,6 +78,7 @@
 #cmakedefine CSNIP_CONF__HAVE_TIMESPEC_GET
 #cmakedefine CSNIP_CONF__HAVE_TIMEVAL
 #cmakedefine CSNIP_CONF__HAVE_VASPRINTF
+#cmakedefine CSNIP_CONF__HAVE_WIN32_SLEEP
 #cmakedefine CSNIP_CONF__HAVE_WRITEV
 
 /** Macros for groups */

src/csnip/log.c

@@ -1,13 +1,14 @@
-#include <csnip/csnip_conf.h>
-
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
+#include <csnip/csnip_conf.h>
+#ifdef CSNIP_CONF__HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #ifdef CSNIP_CONF__HAVE_REGCOMP
 #include <regex.h>
 #endif

src/csnip/time.c

@@ -1,4 +1,21 @@
-#include <sys/time.h>
+#include <time.h>
+
+#include <csnip/csnip_conf.h>
+#ifndef CSNIP_CONF__HAVE_NANOSLEEP
+   /* Access Win32's Sleep() */
+#  ifdef CSNIP_CONF__HAVE_WIN32_SLEEP
+#    define WIN32_LEAN_AND_MEAN
+#    include <windows.h>
+#  endif
+
+   /* Get select() for UNIX platforms that don't have nanosleep.
+    * Note that we can't use WinSock's select() since that requires
+    * library initialization, which the app may not have performed.
+    */
+#  ifdef CSNIP_CONF__HAVE_SYS_SELECT_H
+#    include <sys/select.h>
+#  endif
+#endif
 
 #include "time.h"
 
@@ -53,7 +70,17 @@ struct timeval csnip_time_timespec_as_timeval(struct timespec ts)
 
 int csnip_time_sleep(struct timespec ts)
 {
-	int err = nanosleep(&ts, NULL);
+	int err = 0;
+#if defined(CSNIP_CONF__HAVE_NANOSLEEP)
+	err = nanosleep(&ts, NULL);
+#elif defined(CSNIP_CONF__HAVE_WIN32_SLEEP)
+	DWORD msec = ts.tv_nsec / 1000000;
+	msec += (DWORD)(ts.tv_sec * 1000);
+	Sleep(msec);
+#else
+	struct timeval tv = csnip_time_timespec_as_timeval(ts);
+	err = select(0, NULL, NULL, NULL, &tv);
+#endif
 	if (err != 0) {
 		return csnip_err_ERRNO;
 	}

src/csnip/time.h

@@ -51,9 +51,13 @@
 #include <csnip/csnip_conf.h>
 
 #include <time.h>
-#ifdef CSNIP_CONF__HAVE_TIMEVAL
+
+#ifdef CSNIP_CONF__HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#if defined(CSNIP_CONF__HAVE_WINSOCK2_H)
+#include <WinSock2.h>
+#endif
 
 #include <csnip/err.h>
 

src/csnip/x.h

@@ -13,6 +13,7 @@
  *	csnip's wrapper.
  */
 
+#include <limits.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <stdarg.h>

src/csnip/x/getdelim.c

@@ -10,9 +10,7 @@
 #include <csnip/csnip_conf.h>
 
 /* Check if we can use unlocked stdio, and define macros accordingly. */
-#if defined(CSNIP_CONF__HAVE_FLOCKFILE) \
-    && defined(CSNIP_CONF__HAVE_FUNLOCKFILE) \
-    && defined(CSNIP_CONF__HAVE_UNLOCKED_STDIO)
+#if defined(CSNIP_CONF__HAVE_UNLOCKED_STDIO)
 	#define my_flockfile(fp)	flockfile(fp)
 	#define my_getc(fp)		getc_unlocked(fp)
 	#define my_funlockfile(fp)	funlockfile(fp)

src/csnip/x/readv.c

@@ -2,6 +2,9 @@
 #include <errno.h>
 
 #include <csnip/csnip_conf.h>
+#ifdef CSNIP_CONF__HAVE_IO_H
+#include <io.h>
+#endif
 
 #include <csnip/util.h>
 #include <csnip/x.h>

src/csnip/x/strerror_r.c

@@ -1,19 +1,19 @@
+/*  Linux: Make sure we get XSI version of strerror_r() */
+#define _POSIX_C_SOURCE	200809L
+#undef _GNU_SOURCE
+#include <string.h>
+
 #include <csnip/csnip_conf.h>
 
 #include <csnip/x.h>
 
 #if defined(CSNIP_CONF__HAVE_STRERROR_R)
-/*  Linux: Make sure we get XSI version of strerror_r() */
-#define _POSIX_C_SOURCE	200809L
-#undef _GNU_SOURCE
-#include <string.h>
 
 int csnip_x_strerror_r(int errnum, char* buf, size_t buflen)
 {
 	return strerror_r(errnum, buf, buflen);
 }
 #elif defined(CSNIP_CONF__HAVE_STRERROR_S)
-#include <sec_api/string_s.h>
 
 int csnip_x_strerror_r(int errnum, char* buf, size_t buflen)
 {

test/err_test1.c

@@ -9,7 +9,9 @@
 int main(void)
 {
 	char* a = "XXX";
-	mem_Alloc(128ull * 1024 * 1024 * 1024, a, error_ignore);
+	// XXX:  This is a very broken test.  Always has been.  Remove
+	// it or something.
+	mem_Alloc(1024, a, error_ignore);
 	printf("Pointer: %p\n", (void*)a);
 
 	return 0;