diff options
Diffstat (limited to 'src/windows/wintel')
| -rw-r--r-- | src/windows/wintel/ChangeLog | 6 | ||||
| -rw-r--r-- | src/windows/wintel/font.c | 2 | ||||
| -rw-r--r-- | src/windows/wintel/k5stream.c | 6 | ||||
| -rw-r--r-- | src/windows/wintel/k5stream.h | 6 | ||||
| -rw-r--r-- | src/windows/wintel/screen.c | 4 | ||||
| -rw-r--r-- | src/windows/wintel/screen.h | 2 | ||||
| -rw-r--r-- | src/windows/wintel/telnet.c | 4 | ||||
| -rw-r--r-- | src/windows/wintel/wt-proto.h | 10 |
8 files changed, 23 insertions, 17 deletions
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 1634de5..fda97b4 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 1bab00c..d2858cd 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 4c36cd0..a315385 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 b9b9ebd..3a63ca1 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 52e9103..206c97c 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 bc4267b..e447b42 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 1182fbc..1b943c1 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 dc23f3e..1e96814 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); |