diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-15 21:30:00 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-15 21:30:00 +0000 |
| commit | 53329209370a6acdeef5c7c2211a64db1839b967 (patch) | |
| tree | 36a5705a0160fc6b3905a472a9f4a721a49fbee0 | |
| parent | fa14fb942a45438e3262ee743a73449b379f9ebd (diff) | |
| download | krb5-53329209370a6acdeef5c7c2211a64db1839b967.tar.gz krb5-53329209370a6acdeef5c7c2211a64db1839b967.tar.xz krb5-53329209370a6acdeef5c7c2211a64db1839b967.zip | |
Need to link with $(CLIB).
Explicit Winsock initialization & linking is no longer required (fixed krb5 lib)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9871 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/windows/cns/ChangeLog | 5 | ||||
| -rw-r--r-- | src/windows/cns/Makefile.in | 4 | ||||
| -rw-r--r-- | src/windows/cns/cns.c | 11 |
3 files changed, 15 insertions, 5 deletions
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index 50865491fe..9d982b22c4 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 15 12:21:51 1997 Richard Basch <basch@lehman.com> + + * Makefile.in: Link in ComErr library $(CLIB) + * cns.c: Winsock initialization/teardown is handled by krb5 lib + Mon Feb 10 23:19:26 1997 Richard Basch <basch@lehman.com> * Makefile.in: Use WLIB definition in config/windows.in diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index fbd19166d7..a1459b73ed 100644 --- a/src/windows/cns/Makefile.in +++ b/src/windows/cns/Makefile.in @@ -28,12 +28,12 @@ CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 ##### Linker LINK = link -LIBS = $(KLIB) $(WLIB) +LIBS = $(KLIB) $(CLIB) ##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 wsock32.lib user32.lib gdi32.lib +##WIN32##SYSLIBS = libcd.lib kernel32.lib user32.lib gdi32.lib !else ##WIN16##LFLAGS = /nologo /nod /nopackcode ##WIN32##LFLAGS = /nologo /nod diff --git a/src/windows/cns/cns.c b/src/windows/cns/cns.c index 15e4554b04..15976fa354 100644 --- a/src/windows/cns/cns.c +++ b/src/windows/cns/cns.c @@ -1683,12 +1683,14 @@ quit_application(HINSTANCE hinstance) static BOOL init_instance(HINSTANCE hinstance, int ncmdshow) { - WORD versionrequested; - WSADATA wsadata; - int rc; char buf[20]; int i; +#if 0 + int rc; + WORD versionrequested; + WSADATA wsadata; + versionrequested = 0x0101; /* We need version 1.1 */ rc = WSAStartup(versionrequested, &wsadata); if (rc != 0) { @@ -1705,6 +1707,7 @@ init_instance(HINSTANCE hinstance, int ncmdshow) return FALSE; } +#endif /* * Set up expiration action @@ -1776,7 +1779,9 @@ quit_instance(HINSTANCE hinstance) krb5_cc_close(k5_context, k5_ccache); #endif +#if 0 WSACleanup(); +#endif /* * Unload clock icons |