summaryrefslogtreecommitdiffstats
path: root/src/windows
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2001-10-06 03:14:42 +0000
committerKen Raeburn <raeburn@mit.edu>2001-10-06 03:14:42 +0000
commitc1d2e4e4deaa5d5df19171539a30c13fc43b7a6f (patch)
treeb6b4e2f17a5ab2b237a27c2f6c80f659615285bd /src/windows
parent2e0ebe3766332b985c79b7ff92476c61fa16326b (diff)
downloadkrb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.tar.gz
krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.tar.xz
krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.zip
Danilo also says we can get rid of _MSDOS (Win16) tests, and explicit FAR/NEAR specs
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13786 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
-rw-r--r--src/windows/cns/ChangeLog4
-rw-r--r--src/windows/cns/cns.c4
-rw-r--r--src/windows/gss/ChangeLog4
-rw-r--r--src/windows/gss/gss.c2
-rw-r--r--src/windows/gss/gss.h2
-rw-r--r--src/windows/lib/ChangeLog5
-rw-r--r--src/windows/lib/cacheapi.h4
-rw-r--r--src/windows/wintel/ChangeLog6
-rw-r--r--src/windows/wintel/font.c2
-rw-r--r--src/windows/wintel/k5stream.c6
-rw-r--r--src/windows/wintel/k5stream.h6
-rw-r--r--src/windows/wintel/screen.c4
-rw-r--r--src/windows/wintel/screen.h2
-rw-r--r--src/windows/wintel/telnet.c4
-rw-r--r--src/windows/wintel/wt-proto.h10
15 files changed, 42 insertions, 23 deletions
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index b420e42d56..626e52a2ac 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03 Ken Raeburn <raeburn@mit.edu>
+
+ * cns.c: Don't declare pointers or functions FAR any more.
+
2000-05-08 Ken Raeburn <raeburn@mit.edu>
Nalin Dahyabhai <nalin@redhat.com>
diff --git a/src/windows/cns/cns.c b/src/windows/cns/cns.c
index 512f2f5c36..49aaa23016 100644
--- a/src/windows/cns/cns.c
+++ b/src/windows/cns/cns.c
@@ -1916,9 +1916,9 @@ krb_gethostbyname_wnd_proc(HWND hwnd, UINT message,
* the async routines to emulate the functionality of the synchronous
* routines
*/
-struct hostent FAR *PASCAL FAR
+struct hostent *PASCAL
krb_gethostbyname(
- const char FAR *name)
+ const char *name)
{
HWND hwnd;
char buf[MAXGETHOSTSTRUCT];
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index e192111b07..cefca162c2 100644
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03 Ken Raeburn <raeburn@mit.edu>
+
+ * gss.c, gss.h: Don't declare functions FAR any more.
+
1999-12-03 Danilo Almeida <dalmeida@mit.edu>
* Makefile.in: * Makefile.in: Windows fix for updated win-pre.in.
diff --git a/src/windows/gss/gss.c b/src/windows/gss/gss.c
index f2942f6fd3..2a9b93dcf6 100644
--- a/src/windows/gss/gss.c
+++ b/src/windows/gss/gss.c
@@ -105,7 +105,7 @@ do_gssapi_test (char *name) {
** WM_COMMAND - Input received
**
***************************************************************************/
-BOOL FAR PASCAL
+BOOL PASCAL
OpenGssapiDlg(
HWND hDlg,
WORD message,
diff --git a/src/windows/gss/gss.h b/src/windows/gss/gss.h
index 175044de8f..e9b43c5070 100644
--- a/src/windows/gss/gss.h
+++ b/src/windows/gss/gss.h
@@ -12,7 +12,7 @@
#include <gssapi/gssapi_generic.h>
// gss.c
-BOOL FAR PASCAL OpenGssapiDlg(HWND hDlg, WORD message, WORD wParam, LONG lParam);
+BOOL PASCAL OpenGssapiDlg(HWND hDlg, WORD message, WORD wParam, LONG lParam);
// gss-misc.c
int send_token(int s, gss_buffer_t tok);
diff --git a/src/windows/lib/ChangeLog b/src/windows/lib/ChangeLog
index f99941938b..572f13f3cb 100644
--- a/src/windows/lib/ChangeLog
+++ b/src/windows/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03 Ken Raeburn <raeburn@mit.edu>
+
+ * cacheapi.h: Don't declare pointers FAR any more, nor functions
+ NEAR.
+
2000-04-18 Danilo Almeida <dalmeida@mit.edu>
* cacheapi.h: Update to v2.
diff --git a/src/windows/lib/cacheapi.h b/src/windows/lib/cacheapi.h
index 76615995ae..722eb7e54a 100644
--- a/src/windows/lib/cacheapi.h
+++ b/src/windows/lib/cacheapi.h
@@ -137,10 +137,10 @@ typedef struct _cc_creds {
cc_time_t renew_till;
cc_uint32 is_skey;
cc_uint32 ticket_flags;
- cc_data FAR ** addresses;
+ cc_data ** addresses;
cc_data ticket;
cc_data second_ticket;
- cc_data FAR ** authdata;
+ cc_data ** authdata;
} cc_creds;
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index 1634de5eed..fda97b4108 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-05 Ken Raeburn <raeburn@mit.edu>
+
+ * font.c, k5stream.c, k5stream.h, screen.c, screen.h, telnet.c,
+ wt-proto.h: Don't declare pointers and functions NEAR or FAR any
+ more.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* encrypt.h: Don't use KRB5_DLLIMP.
diff --git a/src/windows/wintel/font.c b/src/windows/wintel/font.c
index 1bab00c7ea..d2858cd104 100644
--- a/src/windows/wintel/font.c
+++ b/src/windows/wintel/font.c
@@ -72,7 +72,7 @@ void ProcessFontChange(
} /* ProcessFontChange */
-void NEAR InitializeStruct(
+void InitializeStruct(
WORD wCommDlgType,
LPSTR lpStruct,
HWND hWnd)
diff --git a/src/windows/wintel/k5stream.c b/src/windows/wintel/k5stream.c
index 4c36cd0b0d..a315385188 100644
--- a/src/windows/wintel/k5stream.c
+++ b/src/windows/wintel/k5stream.c
@@ -33,7 +33,7 @@ kstream_set_buffer_mode(kstream ks, int mode)
kstream
kstream_create_from_fd(int fd,
- const struct kstream_crypt_ctl_block FAR *ctl,
+ const struct kstream_crypt_ctl_block *ctl,
kstream_ptr data)
{
kstream ks;
@@ -61,7 +61,7 @@ kstream_create_from_fd(int fd,
}
int
-kstream_write(kstream ks, void FAR *p_data, size_t p_len)
+kstream_write(kstream ks, void *p_data, size_t p_len)
{
int n;
struct kstream_data_block i;
@@ -86,7 +86,7 @@ kstream_write(kstream ks, void FAR *p_data, size_t p_len)
int
-kstream_read(kstream ks, void FAR *p_data, size_t p_len)
+kstream_read(kstream ks, void *p_data, size_t p_len)
{
int n;
struct kstream_data_block i;
diff --git a/src/windows/wintel/k5stream.h b/src/windows/wintel/k5stream.h
index b9b9ebd33c..3a63ca1d8f 100644
--- a/src/windows/wintel/k5stream.h
+++ b/src/windows/wintel/k5stream.h
@@ -49,9 +49,9 @@ struct kstream_crypt_ctl_block {
int kstream_destroy(kstream);
void kstream_set_buffer_mode(kstream, int);
kstream kstream_create_from_fd(int fd,
- const struct kstream_crypt_ctl_block FAR *,
+ const struct kstream_crypt_ctl_block *,
kstream_ptr);
-int kstream_write(kstream, void FAR *, size_t);
-int kstream_read(kstream, void FAR *, size_t);
+int kstream_write(kstream, void *, size_t);
+int kstream_read(kstream, void *, size_t);
#endif /* K5STREAM_H */
diff --git a/src/windows/wintel/screen.c b/src/windows/wintel/screen.c
index 52e9103c28..206c97c89e 100644
--- a/src/windows/wintel/screen.c
+++ b/src/windows/wintel/screen.c
@@ -631,7 +631,7 @@ static int ScreenAdjustDown(
} /* ScreenAdjustDown */
-long FAR PASCAL ScreenWndProc(
+long PASCAL ScreenWndProc(
HWND hWnd,
UINT message,
WPARAM wParam,
@@ -883,7 +883,7 @@ long FAR PASCAL ScreenWndProc(
wParam = wParam - VK_LEFT + (pScr->DECCKM ? 4 : 0);
SendMessage (pScr->hwndTel, WM_MYCURSORKEY,
strlen(cursor_key[wParam]),
- (LPARAM) (char FAR *) cursor_key[wParam]);
+ (LPARAM) (char *) cursor_key[wParam]);
}
} else { /* Control is down */
switch (wParam) {
diff --git a/src/windows/wintel/screen.h b/src/windows/wintel/screen.h
index bc4267b334..e447b4205a 100644
--- a/src/windows/wintel/screen.h
+++ b/src/windows/wintel/screen.h
@@ -1,4 +1,4 @@
-extern long FAR PASCAL ScreenWndProc(HWND,UINT,WPARAM,LPARAM);
+extern long PASCAL ScreenWndProc(HWND,UINT,WPARAM,LPARAM);
/*
* Definition of attribute bits in the Virtual Screen
diff --git a/src/windows/wintel/telnet.c b/src/windows/wintel/telnet.c
index 1182fbcff7..1b943c1b22 100644
--- a/src/windows/wintel/telnet.c
+++ b/src/windows/wintel/telnet.c
@@ -238,7 +238,7 @@ char buf[2048];
* WM_COMMAND - application menu (About dialog box)
* WM_DESTROY - destroy window
*/
-long FAR PASCAL
+long PASCAL
MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
HGLOBAL hBuffer;
@@ -647,7 +647,7 @@ DoDialog(char *szDialog, FARPROC lpfnDlgProc)
* WM_INITDIALOG - initialize dialog box
* WM_COMMAND - Input received
*/
-BOOL FAR PASCAL
+BOOL PASCAL
OpenTelnetDlg(HWND hDlg, WORD message, WORD wParam, LONG lParam)
{
char szConnectName[256];
diff --git a/src/windows/wintel/wt-proto.h b/src/windows/wintel/wt-proto.h
index dc23f3e213..1e96814b4c 100644
--- a/src/windows/wintel/wt-proto.h
+++ b/src/windows/wintel/wt-proto.h
@@ -12,19 +12,19 @@
HANDLE,
int);
- long FAR PASCAL MainWndProc(
+ long PASCAL MainWndProc(
HWND,
UINT,
WPARAM,
LPARAM);
- BOOL FAR PASCAL About(
+ BOOL PASCAL About(
HWND,
WORD,
WORD,
LONG);
- BOOL FAR PASCAL OpenTelnetDlg(
+ BOOL PASCAL OpenTelnetDlg(
HWND,
WORD,
WORD,
@@ -36,7 +36,7 @@
int,
int);
- BOOL FAR PASCAL ConfigSessionDlg(
+ BOOL PASCAL ConfigSessionDlg(
HWND,
WORD,
WORD,
@@ -56,5 +56,5 @@
kstream ks);
/* somewhere... */
- struct machinfo *FAR PASCAL Shostlook(
+ struct machinfo *PASCAL Shostlook(
char *hname);
generated by cgit (git 2.34.1) at 2025-02-05 13:06:02 +0000