[w3m-dev-en 00075] Re: mktable problem?

From: Fumitoshi UKAI (ukai@debian.or.jp)
Date: Sun Feb 06 2000 - 11:34:19 CST


At Sun, 6 Feb 2000 12:05:43 -0500,
Bob Drzyzgula <bob@drzyzgula.org> wrote:

> Thank you for the patch. Unfortunately, the mktable.c won't
> immediately compile on my machine with that patch; compiler
> ouput below.

Oops, sorry. that patch was wrong.

Index: mktable.c
===================================================================
RCS file: /var/cvs/debian/w3m/mktable.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mktable.c
--- mktable.c 2000/01/05 15:09:44 1.1.1.2
+++ mktable.c 2000/02/06 17:27:05
@@ -16,8 +16,31 @@
 
 defhashfunc(HashItem_ss*,int,hss_i)
 
+#if defined(AIX) || defined(linux)
+/* to cope with Boehm GC... */
+
+#define MAIN real_main
+
+#if defined(DEBIAN)
+# include "gc/private/gc_priv.h"
+#else
+# include "gc_private.h"
+#endif
+int real_main(int, char**, char **);
+
 int
-main(int argc, char *argv[])
+main(int argc, char **argv, char **envp)
+{
+ int dummy;
+ GC_stackbottom = (ptr_t)(&dummy);
+ return(real_main(argc, argv, envp));
+}
+#else
+#define MAIN main
+#endif
+
+int
+MAIN(int argc, char **argv, char **envp)
 {
   FILE *f;
   Hash_ss *hash;
Index: w3mbookmark.c
===================================================================
RCS file: /var/cvs/debian/w3m/w3mbookmark.c,v
retrieving revision 1.1.1.6
diff -u -r1.1.1.6 w3mbookmark.c
--- w3mbookmark.c 2000/01/22 13:15:29 1.1.1.6
+++ w3mbookmark.c 2000/02/06 17:27:13
@@ -133,7 +133,30 @@
   fclose(f);
 }
 
-int main()
+#if defined(AIX) || defined(linux)
+/* to cope with Boehm GC... */
+
+#define MAIN real_main
+
+#if defined(DEBIAN)
+# include "gc/private/gc_priv.h"
+#else
+# include "gc_private.h"
+#endif
+int real_main(int,char**,char**);
+
+int
+main(int argc, char **argv, char **envp)
+{
+ int dummy;
+ GC_stackbottom = (ptr_t)(&dummy);
+ return(real_main(argc, argv, envp));
+}
+#else
+#define MAIN main
+#endif
+
+int MAIN(int argc, char **argv, char **envp)
 {
   extern char *getenv();
   char *qs;
Index: w3mhelperpanel.c
===================================================================
RCS file: /var/cvs/debian/w3m/w3mhelperpanel.c,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 w3mhelperpanel.c
--- w3mhelperpanel.c 2000/01/22 13:15:29 1.1.1.4
+++ w3mhelperpanel.c 2000/02/06 17:27:19
@@ -123,8 +123,31 @@
   printf("w3m-control: INIT_MAILCAP\n");
 }
 
+#if defined(AIX) || defined(linux)
+/* to cope with Boehm GC... */
+
+#define MAIN real_main
+
+#if defined(DEBIAN)
+# include "gc/private/gc_priv.h"
+#else
+# include "gc_private.h"
+#endif
+int real_main(int,char**,char**);
+
+int
+main(int argc, char **argv, char **envp)
+{
+ int dummy;
+ GC_stackbottom = (ptr_t)(&dummy);
+ return(real_main(argc, argv, envp));
+}
+#else
+#define MAIN main
+#endif
+
 int
-main()
+MAIN(int argc, char **argv, char **envp)
 {
   Str mailcapfile;
   extern char *getenv();

Regards,
Fumitoshi UKAI



This archive was generated by hypermail 2b29 : Wed Jul 19 2000 - 10:30:43 CDT