Forwarded.

-- 
  / daniel.haxx.se
---------- Forwarded message ----------
Date: Thu, 1 Nov 2018 02:04:14
From: Stefan Kanthak
Subject: [Patch] Fix some minor bugs in the Windows build
1. all resources defined in curl-7.62.0/lib/libcurl.rc and
    curl-7.62.0/src/curl.rc are language neutral
2. curl-7.62.0/winbuild/MakefileBuild.vc ALWAYS defines the macro
    DEBUGBUILD, so the #ifdef's in line 33 of curl-7.62.0/lib/libcurl.rc
    and curl-7.62.0/src/curl.rc are wrong
3. replace the hard-coded constants in both *.rc files with
    #define'd values
--- curl-7.62.0/lib/libcurl.rc 2017-12-03 00:33
+++ curl-patch/lib/libcurl.rc 2018-10-31 23:45
@@ -25,1 +25,21 @@
-LANGUAGE  0x09,0x01
+LANGUAGE 0, 0
@@ -32,3 +32,3 @@
-  FILEFLAGSMASK   0x3fL
-#if defined(DEBUGBUILD) || defined(_DEBUG)
-  FILEFLAGS 1
+  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+#if (DEBUGBUILD != 0) || defined(_DEBUG)
+  FILEFLAGS VS_FF_DEBUG
@@ -36,1 +36,1 @@
-  FILEFLAGS 0
+  FILEFLAGS 0L
@@ -40,1 +40,1 @@
-  FILESUBTYPE 0x0L
+  FILESUBTYPE 0L
--- curl-7.62.0/src/curl.rc 2018-10-18 14:27
+++ curl-patch/src/curl.rc 2018-10-31 23:45
@@ -25,1 +25,21 @@
-LANGUAGE  0x09,0x01
+LANGUAGE 0, 0
@@ -32,3 +32,3 @@
-  FILEFLAGSMASK   0x3fL
-#if defined(DEBUGBUILD) || defined(_DEBUG)
-  FILEFLAGS 1
+  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+#if (DEBUGBUILD != 0) || defined(_DEBUG)
+  FILEFLAGS VS_FF_DEBUG
@@ -36,1 +36,1 @@
-  FILEFLAGS 0
+  FILEFLAGS 0L
@@ -40,1 +40,1 @@
-  FILESUBTYPE 0x0L
+  FILESUBTYPE 0L
-------------------------------------------------------------------
Unsubscribe: https://cool.haxx.se/list/listinfo/curl-library
Etiquette:   https://curl.haxx.se/mail/etiquette.html