Created a shiny new abstraction for the socket handling. Has many

[u/mdw/putty] / xlat.c

diff --git a/xlat.c b/xlat.c
index d72e3bf..092f5ca 100644 (file)
--- a/xlat.c
+++ b/xlat.c
@@ -1,11 +1,4 @@
 #include <windows.h>
-#ifndef AUTO_WINSOCK
-#ifdef WINSOCK_TWO
-#include <winsock2.h>
-#else
-#include <winsock.h>
-#endif
-#endif
 #include <stdio.h>
 #include "putty.h"
 
@@ -133,10 +126,8 @@ unsigned char xlat_kbd2tty(unsigned char c)
 {
     if(cfg.xlat_enablekoiwin)
        return win2koi[c];
-    else if (cfg.xlat_88592w1250)
+    else if (cfg.xlat_88592w1250 || cfg.xlat_88592cp852)
         return xlatWIN1250toISO88592[c];
-    else if (cfg.xlat_88592cp852)
-        return xlatCP852toISO88592[c];
     return c;
 }
 
@@ -144,6 +135,8 @@ unsigned char xlat_tty2scr(unsigned char c)
 {
     if(cfg.xlat_enablekoiwin)
        return koi2win[c];
+    else if (cfg.xlat_88592w1250)
+        return xlatISO88592toWIN1250[c];
     else if (cfg.xlat_88592cp852)
         return xlatISO88592toCP852[c];
     return c;