From 5b80d07f712ff90cfae4c89084e25eb90dd2e510 Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 9 Oct 2000 12:19:09 +0000
Subject: [PATCH] Miscellaneous fixes to try to make other compilers happier

git-svn-id: svn://svn.tartarus.org/sgt/putty@691 cda61777-01e9-0310-a592-d414129be87e
---
 be_all.c   | 7 +++++++
 be_none.c  | 7 +++++++
 be_nossh.c | 7 +++++++
 ldisc.c    | 7 +++++++
 misc.c     | 7 +++++++
 noise.c    | 7 +++++++
 settings.c | 7 +++++++
 sizetip.c  | 7 +++++++
 sshsha.c   | 2 --
 terminal.c | 7 +++++++
 window.c   | 2 +-
 winstore.c | 7 +++++++
 xlat.c     | 7 +++++++
 13 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/be_all.c b/be_all.c
index 69e44b76..ae58771e 100644
--- 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 d112143e..8151b3d7 100644
--- 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 fdd98288..5dac276f 100644
--- 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 819360d4..b72c7720 100644
--- 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 6bb09c53..e06ced64 100644
--- 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 af75f9d8..1d764d5f 100644
--- 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 1bbf6fb6..de1fb260 100644
--- 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 94407ae5..2e82c181 100644
--- 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 d47b1be9..95d5259e 100644
--- 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 21911920..e38daa37 100644
--- 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 47ca0893..7b7dee12 100644
--- 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 55977648..51f4ee7a 100644
--- 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 dba9f4a7..95fa3437 100644
--- 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"
 
-- 
2.11.0