S-Lang 2.0 (pre 4) has changed it's API; SLang_Error is now a hidden internal. And SLexpand_escaped_string() takes an extra UTF8 parameter.

SGML.c; missing prototypes for asci_toupper() etc.

--gv
--- orig\src\LYStrings.c        Sun Jan 02 22:35:21 2005
+++ src\LYStrings.c     Sat Feb 12 15:49:38 2005
@@ -46,6 +46,14 @@
#define BUTTON_CTRL     0       /* Quick hack */
#endif

+#ifdef USE_SLANG
+#if SLANG_VERSION >= 20000
+#define SLANG_ERROR()  SLang_get_error()
+#else
+#define SLANG_ERROR()  SLang_Error
+#endif
+#endif
+
/*
 * The edit_history lists allow the user to press tab when entering URL to get
 * the closest match in the closet
@@ -827,9 +835,15 @@

#ifdef USE_SLANG
#define define_key(string, code) \
-       SLkm_define_keysym (string, code, Keymap_List)
+       SLkm_define_keysym ((char*)(string), code, Keymap_List)
+#if SLANG_VERSION >= 20000
+#define expand_substring(dst, first, last, final) \
+       (SLexpand_escaped_string(dst, (char *)first, (char *)last, 0) == 0 ? 1 
: 0)
+#else
#define expand_substring(dst, first, last, final) \
        (SLexpand_escaped_string(dst, (char *)first, (char *)last), 1)
+#endif
+
static SLKeyMap_List_Type *Keymap_List;

/* This value should be larger than anything in LYStrings.h */
@@ -1248,7 +1262,7 @@
         * occasionally find useful).
         */
        SLang_undefine_key(parse, Keymap_List);
-       if (SLang_Error)
+       if (SLANG_ERROR())
            return -1;
#endif
    }
@@ -1391,7 +1405,7 @@
    setup_vtXXX_keymap();
    define_key("\033[M", MOUSE_KEYSYM);

-    if (SLang_Error)
+    if (SLANG_ERROR())
        SLang_exit_error("Unable to initialize keymaps");
#else
    setup_vtXXX_keymap();
--- orig\WWW\Library\Implementation\SGML.c      Sun Jan 02 22:35:21 2005
+++ WWW\Library\Implementation\SGML.c   Sat Feb 12 15:27:50 2005
@@ -33,6 +33,7 @@
#include <LYGlobalDefs.h>
#include <LYStrings.h>
#include <LYLeaks.h>
+#include <LYUtils.h>

#ifdef USE_COLOR_STYLE
# include <LYStyle.h>
_______________________________________________
Lynx-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/lynx-dev

Reply via email to