Various fixes for 64-bit support

3rdp/build/cl-fix-mb-w-conv-warnings.patch

@@ -4,7 +4,7 @@
    #endif /* OpenBSD safe string functions */
  
    /* Widechar functions */
-+#if (!defined(__GNUC__)) || (__GNUC__ < 5)
++#if (!defined(__GNUC__)) || (__GNUC__ < 5) || (!defined(__MINGW32__))
    int mbstowcs_s( size_t *retval, wchar_t *dst, size_t dstmax, 
  				  const char *src, size_t len );
    int wcstombs_s( size_t *retval, char *dst, size_t dstmax, 
@@ -19,7 +19,7 @@
  ****************************************************************************/
  
  #ifndef __STDC_LIB_EXT1__
-+#if (!defined(__GNUC__)) || (__GNUC__ < 5)
++#if (!defined(__GNUC__)) || (__GNUC__ < 5) || (!defined(__MINGW32__))
  
  /* Minimal wrappers for the TR 24731 functions to map them to older stdlib 
     equivalents.  Because of potential issues when comparing a (signed)

src/sbbs3/GNUmakefile

@@ -49,9 +49,11 @@ UTIL_LDFLAGS	+=	$(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDE
 CONSOLE_LDFLAGS	+=	$(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS)
 UTIL_LIBS	+=	$(HASH_LIBS)
 
-ifndef bcc
- ifneq ($(os),sunos)
-  LDFLAGS	+=	-lutil
+ifndef win
+ ifndef bcc
+  ifneq ($(os),sunos)
+   LDFLAGS	+=	-lutil
+  endif
  endif
 endif
 

src/sexpots/GNUmakefile

@@ -3,7 +3,7 @@ include ${SRC_ROOT}/build/Common.gmake
 
 CFLAGS  +=       -I${SRC_ROOT}/comio -I${SRC_ROOT}/sbbs3 $(XPDEV-MT_CFLAGS)
 LDFLAGS +=       $(XPDEV-MT_LDFLAGS)
-ifeq ($(os), win32)
+ifdef win
 	OBJS += $(MTOBJODIR)$(DIRSEP)comio_win32$(OFILE)
 	CFLAGS += -DTELNET_NO_DLL
 else

src/xpdev/strwrap.h

@@ -14,7 +14,9 @@ char* ltoa(long val, char* str, int radix);
 }
 #endif
 
+#if (!defined(__MINGW32__)) || (__GNUC__ < 5)
 #define strset(x,y)	memset(x, y, strlen(x))
+#endif
 
 #endif