* _slang.h: Include slang-mc.h.

* slang-mc.h: Add protection against using with system installed
S-Lang library.
* sl*.c: Only include _slang.h, but not slang.h to avoid making
symlinks.

slang/ChangeLog

@@ -1,3 +1,11 @@
+2001-12-21  Pavel Roskin  <proski@gnu.org>
+
+	* _slang.h: Include slang-mc.h.
+	* slang-mc.h: Add protection against using with system installed
+	S-Lang library.
+	* sl*.c: Only include _slang.h, but not slang.h to avoid making
+	symlinks.
+
 2001-09-04  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.am (AM_CFLAGS): Remove CFLAGS, don't use substituted

slang/_slang.h

@@ -13,6 +13,7 @@
 #include <string.h>
 #include <glib.h>
 
+#include "slang-mc.h"
 #include "jdmacros.h"
 
 #ifdef VMS

slang/slang-mc.h

@@ -8,6 +8,11 @@
  * License or the Perl Artistic License.
  */
 #define SLANG_VERSION 9938
+
+#ifdef HAVE_SYSTEM_SLANG 
+ #error "This file must not be used with system installed S-Lang library"
+#endif
+
 /*{{{ System Dependent Macros and Typedefs */
 
 #if defined(__WATCOMC__) && !defined(__QNX__)

slang/sldisply.c

@@ -107,7 +107,6 @@
 #endif
 
 #include <errno.h>
-#include "slang.h"
 #include "_slang.h"
 
 #ifdef HAVE_STDLIB_H

slang/slerr.c

@@ -17,7 +17,6 @@
 # include <stdlib.h>
 #endif
 
-#include "slang.h"
 #include "_slang.h"
 
 void (*SLang_Error_Routine)(char *);

slang/slgetkey.c

@@ -8,7 +8,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "slang.h"
 #include "_slang.h"
 
 unsigned int SLang_Input_Buffer_Len = 0;

slang/slmemcpy.c

@@ -14,7 +14,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "slang.h"
 #include "_slang.h"
 
 char *SLmemcpy(char *s1, char *s2, int n)

slang/slmemset.c

@@ -16,7 +16,6 @@
 #include <stdio.h>
 
 
-#include "slang.h"
 #include "_slang.h"
 
 void SLmemset(char *p, char space, int n)

slang/slos2tty.c

@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 
-#include "slang.h"
 #include "_slang.h"
 
 #define INCL_BASE

slang/slsignal.c

@@ -13,7 +13,6 @@
 
 #include <errno.h>
 
-#include "slang.h"
 #include "_slang.h"
 
 /* This function will cause system calls to be restarted after signal if possible */

slang/slsmg.c

@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "slang.h"
 #include "_slang.h"
 
 typedef struct Screen_Type

slang/sltermin.c

@@ -17,7 +17,6 @@
 #endif
 
 #ifndef USE_SETUPTERM
-#include "slang.h"
 #include "_slang.h"
 
 /*

slang/sltoken.c

@@ -31,7 +31,6 @@
 # include <stdlib.h>
 #endif
 #include <string.h>
-#include "slang.h"
 #include "_slang.h"
 
 /* There are non-zeros at positions "\t %()*,/:;[]{}" */

slang/slutty.c

@@ -67,7 +67,6 @@
 #endif
 
 
-#include "slang.h"
 #include "_slang.h"
 
 int SLang_TT_Read_FD = -1;

slang/slw32tty.c

@@ -11,7 +11,6 @@
 #include <windows.h>
 #include <winbase.h>
 
-#include "slang.h"
 #include "_slang.h"
 
 #ifdef __cplusplus