Borland build fixes (from Yitzhak)

> This patch fixes warnings relating to pointers (using int *
> instead of unsigned int * ), provides prototypes for some
> functions, and adds a missing argument to one of the functions
>
> It also changes a bit in the way flex/bison are used in the
> Borland makefile to allow me to test compilation with those
> utilities using a batch file.

diff --git a/sys/winnt/Makefile.bcc b/sys/winnt/Makefile.bcc
index c8ec7f74762e6beba684af7a64da2cc8e3a94bbb..e5063485b5b504279096f97363ab6bd26513ef82 100644 (file)
--- a/sys/winnt/Makefile.bcc
+++ b/sys/winnt/Makefile.bcc
@@ -136,15 +136,19 @@ OBJ     = o
 # Yacc/Lex ... if you got 'em.
 #
 # If you have yacc and lex programs (or work-alike such as bison 
-# and flex), comment out the upper two macros and uncomment 
-# the lower two.
+# and flex), uncomment the upper two macros.
 #
 
-DO_YACC = YACC_MSG
-DO_LEX  = LEX_MSG
 #DO_YACC  = YACC_ACT
 #DO_LEX   = LEX_ACT
 
+!IFNDEF DO_YACC
+DO_YACC = YACC_MSG
+!ENDIF
+!IFNDEF DO_LEX
+DO_LEX  = LEX_MSG
+!ENDIF
+
 # Wilbur Streett's Win32 ports of GNU bison and flex are available at:
 #    http://www.monmouth.com/~wstreett/lex-yacc/lex-yacc.html
 #

diff --git a/sys/winnt/nh340key.c b/sys/winnt/nh340key.c
index 31bf1f61549ac43e93873fad527f080a2a89b03f..be3f870bf97b75aa2498886ef1df8642f3321777 100644 (file)
--- a/sys/winnt/nh340key.c
+++ b/sys/winnt/nh340key.c
@@ -22,6 +22,10 @@ extern INPUT_RECORD ir;
 char dllname[512];
 char *shortdllname;
 
+int FDECL(__declspec(dllexport) __stdcall
+ProcessKeystroke, (HANDLE hConIn, INPUT_RECORD *ir, 
+    boolean *valid, BOOLEAN_P numberpad, int portdebug));
+
 int WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved)
 {
        char dlltmpname[512];
@@ -214,7 +218,7 @@ int __declspec(dllexport) __stdcall
 CheckInput(hConIn, ir, count, numpad, mode, mod, cc)
 HANDLE hConIn;
 INPUT_RECORD *ir;
-int *count; 
+DWORD *count; 
 boolean numpad;
 int mode;
 int *mod;

diff --git a/sys/winnt/nhdefkey.c b/sys/winnt/nhdefkey.c
index ad7156b03d42bdc499549b8c7be09e83ddf13f51..1b809b704dbcf9f8b35adefb4326a36e5ee52d79 100644 (file)
--- a/sys/winnt/nhdefkey.c
+++ b/sys/winnt/nhdefkey.c
@@ -28,6 +28,10 @@ extern INPUT_RECORD ir;
 char dllname[512];
 char *shortdllname;
 
+int FDECL(__declspec(dllexport) __stdcall
+ProcessKeystroke, (HANDLE hConIn, INPUT_RECORD *ir, 
+    boolean *valid, BOOLEAN_P numberpad, int portdebug));
+
 int WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved)
 {
        char dlltmpname[512];
@@ -246,7 +250,7 @@ int __declspec(dllexport) __stdcall
 CheckInput(hConIn, ir, count, numpad, mode, mod, cc)
 HANDLE hConIn;
 INPUT_RECORD *ir;
-int *count; 
+DWORD *count; 
 boolean numpad;
 int mode;
 int *mod;

diff --git a/sys/winnt/nhraykey.c b/sys/winnt/nhraykey.c
index 475f27fde877d046ccbeff0b233d5fca21617ee4..e1f4c8d88aea59cb95b5b784d996f84142380f9c 100644 (file)
--- a/sys/winnt/nhraykey.c
+++ b/sys/winnt/nhraykey.c
@@ -4,6 +4,7 @@
 
 /*
  * Keystroke handling contributed by Ray Chason.
+ * The following text was written by Ray Chason.
  *  
  * The problem
  * ===========
@@ -153,6 +154,7 @@
  *     * After pushing the bogus key and calling ReadConsole, check to see
  *       if we got the bogus key; if so, and an Alt is pressed, process the
  *       event as an Alt sequence.
+ * 
  */
 
 static char where_to_get_source[] = "http://www.nethack.org/";
@@ -167,6 +169,10 @@ extern INPUT_RECORD ir;
 char dllname[512];
 char *shortdllname;
 
+int FDECL(__declspec(dllexport) __stdcall
+ProcessKeystroke, (HANDLE hConIn, INPUT_RECORD *ir, 
+    boolean *valid, BOOLEAN_P numberpad, int portdebug));
+
 static INPUT_RECORD bogus_key;
 
 int WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved)
@@ -444,7 +450,8 @@ int __declspec(dllexport) __stdcall
 CheckInput(hConIn, ir, count, numpad, mode, mod, cc)
 HANDLE hConIn;
 INPUT_RECORD *ir;
-int *count, *mod;
+DWORD *count;
+int *mod;
 boolean numpad;
 coord *cc;
 {

diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c
index 3dca82969da82288eb091369afb22226e6a30e62..88e20826bfb0f11df9ef83c10943efd310a51bb7 100644 (file)
--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -18,6 +18,8 @@
 
 void FDECL(cmov, (int, int));
 void FDECL(nocmov, (int, int));
+int FDECL(process_keystroke, (INPUT_RECORD *, boolean *,
+    BOOLEAN_P numberpad, int portdebug));
 
 /*
  * The following WIN32 Console API routines are used in this file.
@@ -69,7 +71,7 @@ typedef int (__stdcall * NHKBHIT)(
 typedef int (__stdcall * CHECKINPUT)(
        HANDLE,
        INPUT_RECORD *,
-       int *,
+       DWORD *,
        BOOLEAN_P,
        int,
        int *,
@@ -799,7 +801,7 @@ win32con_debug_keystrokes()
        while (!valid || ch != 27) {
           ReadConsoleInput(hConIn,&ir,1,&count);
           if ((ir.EventType == KEY_EVENT) && ir.Event.KeyEvent.bKeyDown)
-               ch = process_keystroke(&ir, &valid, 1);
+               ch = process_keystroke(&ir, &valid, iflags.num_pad, 1);
        }
        (void)doredraw();
 }