Need the Winsock initialization/cleanup to setup the blocking hook

Removed the crufty DEBUG logic in Makefile.in (it doesn't work)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9903 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 623b73e880303dfbf330a5660419d81ff43fb9cb..ffa1d92619d9f204c2076df361001b24056fd765 100644 (file)
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -5,7 +5,6 @@ NAME     = krb5
 OBJS    = cns.obj tktlist.obj password.obj options.obj
 
 ##### Options
-#DEBUG          = 1
 !IF ! defined(KVERSION)
 KVERSION = 5
 !endif
@@ -17,11 +16,7 @@ INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
 ##WIN16##XOBJS    = kpasswd.obj
 ##WIN32##XOBJS    = cnsres5.obj kpasswd.obj
 
-!if defined(DEBUG)
-CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 /Zi /Yd /DDEBUG
-!else
 CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1
-!endif
 
 ##WIN16##RFLAGS         = /nologo /D$(KRB)=1 $(INCLUDES)
 ##WIN32##RFLAGS         = /D$(KRB)=1 $(INCLUDES)
@@ -30,15 +25,9 @@ CFLAGS       = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1
 LINK    = link
 LIBS    = $(KLIB) $(CLIB) $(WLIB)
 ##WIN16##SYSLIBS  = libw llibcew
-!if defined(DEBUG)
-##WIN16##LFLAGS         = /co /nologo /nod /nopackcode /map:full
-##WIN32##LFLAGS         = /nologo /nod /debug
-##WIN32##SYSLIBS = libcd.lib kernel32.lib user32.lib gdi32.lib
-!else
 ##WIN16##LFLAGS  = /nologo /nod /nopackcode
 ##WIN32##LFLAGS         = /nologo /nod
 ##WIN32##SYSLIBS = libc.lib kernel32.lib wsock32.lib user32.lib gdi32.lib
-!endif
 
 all:: makefile $(NAME).exe
 

diff --git a/src/windows/cns/cns.c b/src/windows/cns/cns.c
index 15976fa354cfa6ebccef463873da7f962f0a3089..10a491a73ae97ad112bd27afa4a7d0462720707e 100644 (file)
--- a/src/windows/cns/cns.c
+++ b/src/windows/cns/cns.c
@@ -1685,8 +1685,6 @@ init_instance(HINSTANCE hinstance, int ncmdshow)
 {
   char buf[20];
   int i;
-
-#if 0
   int rc;
   WORD versionrequested;
   WSADATA wsadata;
@@ -1707,7 +1705,6 @@ init_instance(HINSTANCE hinstance, int ncmdshow)
 
     return FALSE;
   }
-#endif
 
   /*
    * Set up expiration action
@@ -1779,9 +1776,7 @@ quit_instance(HINSTANCE hinstance)
   krb5_cc_close(k5_context, k5_ccache);
 #endif
 
-#if 0
   WSACleanup();
-#endif
 
   /*
    * Unload clock icons