Merge pull request #132 from coltongit/patch-12

Further fixes to MXE compilation

Makefile

@@ -419,7 +419,13 @@ else
 endif
 
 ifeq ($(WINDOWS_BUILD),1)
-  LD := $(CXX)
+  ifeq ($(CROSS),i686-w64-mingw32.static-) # fixes compilation in MXE on Linux and WSL
+    LD := $(CC)
+  else ifeq ($(CROSS),x86_64-w64-mingw32.static-)
+    LD := $(CC)
+  else
+    LD := $(CXX)
+  endif
 else
   LD := $(CC)
 endif

include/PR/os_libc.h

@@ -3,8 +3,28 @@
 
 #include "ultratypes.h"
 
-// Old deprecated functions from strings.h, replaced by memcpy/memset.
+// old bstring functions that aren't present on some platforms
+
+#if defined(__APPLE__)
+
+// macOS libc has them
+#include <strings.h>
+
+#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L)
+
+// there's no way that shit's defined, use memcpy/memset
+#include <string.h>
+#undef bzero
+#undef bcopy
+#define bzero(buf, len) memset((buf), 0, (len))
+#define bcopy(src, dst, len) memcpy((dst), (src), (len))
+
+#else
+
+// hope for the best
 extern void bcopy(const void *, void *, size_t);
 extern void bzero(void *, size_t);
 
+#endif
+
 #endif /* !_OS_LIBC_H_ */