Fix Windows Simulator demo build failures by adding missing windows.h includes (#1305)

* Fix windows.h include

* Update link

* Fix python error

* Remove not working URL

Author: moninom1

source/portable/NetworkInterface/DriverSAM/gmac_SAM.c

@@ -42,7 +42,7 @@
  */
 
 /*
- * Support and FAQ: visit <a href="https://www.microchip.com/en-us/support/design-help">Atmel Support</a>
+ * Support and FAQ: visit Microchip Support website
  */
 
 

source/portable/NetworkInterface/DriverSAM/gmac_SAM.h

@@ -42,7 +42,7 @@
  */
 
 /*
- * Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
+ * Support and FAQ: visit Microchip Support website
  */
 
 #ifndef GMAC_H_INCLUDED

source/portable/NetworkInterface/ksz8851snl/ksz8851snl.c

@@ -43,7 +43,7 @@
  */
 
 /*
- * Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
+ * Support and FAQ: visit Microchip Support website
  */
 
 /* FreeRTOS includes. */

source/portable/NetworkInterface/ksz8851snl/ksz8851snl.h

@@ -43,7 +43,7 @@
  */
 
 /*
- * Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
+ * Support and FAQ: visit Microchip Support website
  */
 
 #ifndef KSZ8851SNL_H_INCLUDED

source/portable/NetworkInterface/ksz8851snl/ksz8851snl_reg.h

@@ -43,7 +43,7 @@
  */
 
 /*
- * Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
+ * Support and FAQ: visit Microchip Support website
  */
 
 #ifndef KSZ8851SNL_REG_H_INCLUDED

source/portable/NetworkInterface/libslirp/MBuffNetworkInterface.c

@@ -27,6 +27,10 @@
 
 #include <stdlib.h>
 
+#if defined( _WIN32 )
+    #include <windows.h>
+#endif
+
 /* FreeRTOS includes. */
 #include "FreeRTOS.h"
 #include "list.h"

test/cbmc/proofs/make_common_makefile.py

@@ -30,7 +30,7 @@
 import argparse
 
 def cleanup_whitespace(string):
-    return re.sub('\s+', ' ', string.strip())
+    return re.sub(r'\s+', ' ', string.strip())
 
 ################################################################
 # Operating system specific values
@@ -83,9 +83,9 @@ def patch_compile_output(opsys, line, key, value):
 
     if key in ["COMPILE_ONLY", "COMPILE_LINK"] and value is not None:
         if value[-1] == '/Fo':
-            return re.sub('/Fo\s+', '/Fo', line)
+            return re.sub(r'/Fo\s+', '/Fo', line)
         if value[-1] == '/Fe':
-            return re.sub('/Fe\s+', '/Fe', line)
+            return re.sub(r'/Fe\s+', '/Fe', line)
     return line
 
 ################################################################
@@ -181,7 +181,7 @@ def write_makefile(opsys, template, defines, makefile):
     with open(template) as _template:
         for line in _template:
             line = patch_path_separator(opsys, line)
-            keys = re.findall('@(\w+)@', line)
+            keys = re.findall(r'@(\w+)@', line)
             values = [find_definition(key, defines) for key in keys]
             for key, value in zip(keys, values):
                 if value is not None: