From 0cd8f81bdc82678c5e84d1e26ad42715f9abf7fe Mon Sep 17 00:00:00 2001 From: "Andrew V. Samoilov" Date: Mon, 29 Nov 2004 11:11:47 +0000 Subject: [PATCH] * Makefile.am: Use AM_CPPFLAGS for path to mc-slang includes. * slmisc.c (SLang_Version): Declare const. Use SLANG_VERSION for version number. * include/slang.h (SLang_Version): Declare const. --- slang/ChangeLog | 7 +++++++ slang/Makefile.am | 3 ++- slang/include/slang.h | 2 +- slang/slmisc.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/slang/ChangeLog b/slang/ChangeLog index da3513c22..749c2413c 100644 --- a/slang/ChangeLog +++ b/slang/ChangeLog @@ -1,3 +1,10 @@ +2004-11-29 Pavel S. Shirshov + + * Makefile.am: Use AM_CPPFLAGS for path to mc-slang includes. + * slmisc.c (SLang_Version): Declare const. Use SLANG_VERSION for version + number. + * include/slang.h (SLang_Version): Declare const. + 2004-11-09 Andrew V. Samoilov * sldisply.c (SLtt_delete_nlines): Add boundary check. diff --git a/slang/Makefile.am b/slang/Makefile.am index 4d6f3529b..c1fa83be2 100644 --- a/slang/Makefile.am +++ b/slang/Makefile.am @@ -1,4 +1,5 @@ -AM_CFLAGS = $(GLIB_CFLAGS) -I$(srcdir)/include +AM_CFLAGS = $(GLIB_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/include if INCLUDED_SLANG noinst_LIBRARIES = libmcslang.a diff --git a/slang/include/slang.h b/slang/include/slang.h index 442b894bf..0f4ec4b75 100644 --- a/slang/include/slang.h +++ b/slang/include/slang.h @@ -741,7 +741,7 @@ extern int SLarray_map_array (SLCONST SLarray_Map_Type *); extern char *SLang_User_Prompt; /* Prompt to use when reading from stdin */ - extern int SLang_Version; + extern const int SLang_Version; extern char *SLang_Version_String; extern char *SLang_Doc_Dir; diff --git a/slang/slmisc.c b/slang/slmisc.c index 9ad716231..9d252878b 100644 --- a/slang/slmisc.c +++ b/slang/slmisc.c @@ -11,7 +11,7 @@ #include "slang.h" #include "_slang.h" -int SLang_Version = 10409; +const int SLang_Version = SLANG_VERSION; /* p and ch may point to the same buffer */ char *_SLexpand_escaped_char(char *p, char *ch)