Miscellaneous fixes to try to make other compilers happier

[originally from svn r691]

diff --git a/be_all.c b/be_all.c
index 69e44b760fb7dcaff941d830759f60aee9495a20..ae58771e733b0450771e35e3208ab34f83859c6c 100644 (file)
--- a/be_all.c
+++ b/be_all.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 

diff --git a/be_none.c b/be_none.c
index d112143ee1f5ba4191654bd2584eb71e1cdb4e1c..8151b3d7ab4616c5e36381a0481eb383d8d7cdab 100644 (file)
--- a/be_none.c
+++ b/be_none.c
@@ -5,6 +5,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 

diff --git a/be_nossh.c b/be_nossh.c
index fdd9828827dd49a8f35aeb01336a640a0218c7c8..5dac276f90f1ac66ba39d308592f07adba8e32c5 100644 (file)
--- a/be_nossh.c
+++ b/be_nossh.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 

diff --git a/ldisc.c b/ldisc.c
index 819360d43d38acc8f5aac68483410bb450902657..b72c77201c5e607f380cfcc04703939dd16df8b5 100644 (file)
--- a/ldisc.c
+++ b/ldisc.c
@@ -1,4 +1,11 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include <ctype.h>
 

diff --git a/misc.c b/misc.c
index 6bb09c535d612db0cae34efe8752af49c6e3a9fb..e06ced6461ea1f6ca4835ce47547df9d437f82c3 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,11 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include "putty.h"

diff --git a/noise.c b/noise.c
index af75f9d895a0be0aed72b64a76481e49a8b3ef57..1d764d5f938fcb3f00cdbbf0b76ec46fada868a3 100644 (file)
--- a/noise.c
+++ b/noise.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 
 #include "putty.h"

diff --git a/settings.c b/settings.c
index 1bbf6fb6b307fe4c6c851c76bb57082497e83050..de1fb26058bff41770fc50b5ac84ff9748fd1f54 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -3,6 +3,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 #include "storage.h"

diff --git a/sizetip.c b/sizetip.c
index 94407ae52a0cba7309c2c9a74562c401dd4853a5..2e82c18179028bff9712e33a8a9537adf3e60a60 100644 (file)
--- a/sizetip.c
+++ b/sizetip.c
@@ -1,4 +1,11 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <winreg.h>
 #include <tchar.h>
 #include <stdio.h>

diff --git a/sshsha.c b/sshsha.c
index d47b1be937ddd078b675f7845deef6c154d8e80c..95d5259e352d87537f196f8335958033f5a536dd 100644 (file)
--- a/sshsha.c
+++ b/sshsha.c
@@ -7,8 +7,6 @@
 
 #include "ssh.h"
 
-typedef unsigned int uint32;
-
 /* ----------------------------------------------------------------------
  * Core SHA algorithm: processes 16-word blocks into a message digest.
  */

diff --git a/terminal.c b/terminal.c
index 219119205e32d6036497540044a30f280811017f..e38daa3751efb94dc5c88ee3a391fb4690e85d6c 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1,4 +1,11 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/window.c b/window.c
index 47ca089352492f7fef621aa2fc03a6c69e8383f7..7b7dee12456ed9df24d0554aa88bc9fe1724a29f 100644 (file)
--- a/window.c
+++ b/window.c
@@ -745,7 +745,7 @@ font_messup:
 
     if (cfg.fontisbold) {
        fw_dontcare = FW_BOLD;
-       fw_bold = FW_BLACK;
+       fw_bold = FW_HEAVY;
    } else {
        fw_dontcare = FW_DONTCARE;
        fw_bold = FW_BOLD;

diff --git a/winstore.c b/winstore.c
index 5597764897d9abf1cf9682eb6c912269290652ab..51f4ee7ac2aff19a20f075996727dd1d37b46967 100644 (file)
--- a/winstore.c
+++ b/winstore.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 #include "storage.h"

diff --git a/xlat.c b/xlat.c
index dba9f4a7edeb4f9648e07c14c4179e6a1b9a8fe8..95fa3437d598da0d4498048a6c5723f9a459faf4 100644 (file)
--- a/xlat.c
+++ b/xlat.c
@@ -1,4 +1,11 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"