* nlm/gdbserve.c: conditionalize header file inclusion for either

  NetWare 4.0 or PIN targets.
* nlm/i386.c: include appropriate header files.
* nlm/prelude.c: define TERMINATE_BY_UNLOAD for NetWare 4.0
  targets.

diff --git a/gdb/nlm/gdbserve.c b/gdb/nlm/gdbserve.c
index 31a0c6e8524788bb1cb36f66532f0160c4372f1d..9eecc70e1f06f49c57ef374ef56dd3e315e94ebf 100644 (file)
--- a/gdb/nlm/gdbserve.c
+++ b/gdb/nlm/gdbserve.c
@@ -66,19 +66,30 @@
  *
  ****************************************************************************/
 
-#include <nwdfs.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#include <errno.h>
+
+#if defined(__netware__) && defined(__i386__)
+#include <dfs.h>
+#include <conio.h>
+#include <advanced.h>
+#include <debugapi.h>
+#include <process.h>
+#else
+#include <nwdfs.h>
 #include <nwconio.h>
 #include <nwadv.h>
 #include <nwdbgapi.h>
-#include <errno.h>
 #include <nwthread.h>
+#endif
 #include <aio.h>
+
 #include "cpu.h"
 
+
 /****************************************************/
 /* This information is from Novell.  It is not in any of the standard
    NetWare header files.  */

diff --git a/gdb/nlm/i386.c b/gdb/nlm/i386.c
index 68132ce28a8eec42ab06c314890a3b4d928235e3..a9333fb665245a868512838a824423b51298b662 100644 (file)
--- a/gdb/nlm/i386.c
+++ b/gdb/nlm/i386.c
@@ -1,3 +1,14 @@
+#include <dfs.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <time.h>
+#include <conio.h>
+#include <advanced.h>
+#include <debugapi.h>
+#include <process.h>
+#include <errno.h>
 #include "i386.h"
 
 /* Get the registers out of the frame information.  */

diff --git a/gdb/nlm/prelude.c b/gdb/nlm/prelude.c
index e3207c26093a977d3482b20f25849aba9eda812f..37e12c89a2bb3a1305adaf066ae203cdb1f08d59 100644 (file)
--- a/gdb/nlm/prelude.c
+++ b/gdb/nlm/prelude.c
@@ -12,9 +12,14 @@
 =      be distributed with CLib.NLM and its headers.
 ==============================================================================
 */
+
+#include <stddef.h>
+#if defined(__netware__) && defined(__i386__)
+#define TERMINATE_BY_UNLOAD    5
+#else
 #include <nwpre.h>
+#endif
 /*#include "libhooks.h"*/
-#include <stddef.h>
 
 extern int main (int, char **);