projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an indirection layer between mtcpnet.c and the rest of PuTTY so that
[u/mdw/putty]
/
mac
/
mac.c
diff --git
a/mac/mac.c
b/mac/mac.c
index
fe46f3f
..
632b6a4
100644
(file)
--- a/
mac/mac.c
+++ b/
mac/mac.c
@@
-1,4
+1,4
@@
-/* $Id: mac.c,v 1.2
3 2003/01/10 18:33:35 simo
n Exp $ */
+/* $Id: mac.c,v 1.2
4 2003/01/11 19:43:59 be
n Exp $ */
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
@@
-169,8
+169,13
@@
static void mac_startup(void) {
mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
-
- mactcp_init();
+ /* MacTCP? */
+ if (Gestalt(FOUR_CHAR_CODE('mtcp'), &mac_gestalts.mtcpvers) != noErr)
+ mac_gestalts.mtcpvers = 0;
+ if (mac_gestalts.mtcpvers > 0) {
+ if (mactcp_init() != noErr)
+ mac_gestalts.mtcpvers = 0;
+ }
/* We've been tested with the Appearance Manager */
if (mac_gestalts.apprvers != 0)
/* We've been tested with the Appearance Manager */
if (mac_gestalts.apprvers != 0)
@@
-225,7
+230,8
@@
static void mac_eventloop(void) {
mac_adjustcursor(cursrgn);
if (gotevent)
mac_event(&event);
mac_adjustcursor(cursrgn);
if (gotevent)
mac_event(&event);
- mactcp_poll();
+ if (mac_gestalts.mtcpvers != 0)
+ mactcp_poll();
mac_pollterm();
}
DisposeRgn(cursrgn);
mac_pollterm();
}
DisposeRgn(cursrgn);
@@
-617,7
+623,8
@@
void cleanup_exit(int status)
if (mac_gestalts.encvvers != 0)
TerminateUnicodeConverter();
#endif
if (mac_gestalts.encvvers != 0)
TerminateUnicodeConverter();
#endif
- mactcp_shutdown();
+ if (mac_gestalts.mtcpvers != 0)
+ mactcp_shutdown();
exit(status);
}
exit(status);
}