Miscellaneous fixes to try to make other compilers happier

git-svn-id: svn://svn.tartarus.org/sgt/putty@691 cda61777-01e9-0310-a592-d414129be87e

diff --git a/be_all.c b/be_all.c
index 69e44b7..ae58771 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 d112143..8151b3d 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 fdd9828..5dac276 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 819360d..b72c772 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 6bb09c5..e06ced6 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 af75f9d..1d764d5 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 1bbf6fb..de1fb26 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 94407ae..2e82c18 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 d47b1be..95d5259 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 2191192..e38daa3 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 47ca089..7b7dee1 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 5597764..51f4ee7 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 dba9f4a..95fa343 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"