aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--gcmain.c28
-rw-r--r--main.c6
-rw-r--r--mktable.c6
-rw-r--r--w3mbookmark.c6
-rw-r--r--w3mhelperpanel.c6
6 files changed, 19 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index 45c036c..3e6bad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-12 Akira TAGOH <at@gclab.org>
+
+ * [w3m-dev 03415] fix a build issue for 64bit arch
+ * gcmain.c: deleted
+ * main.c: no need gcmain.c
+ s/MAIN/main/
+ * mktable.c: ditto
+ * w3mbookmark.c: ditto
+ * w3mhelperpanel.c: ditto
+
2002-11-12 Fumitoshi UKAI <ukai@debian.or.jp>
* doc/w3m.1: update
@@ -4567,4 +4577,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.502 2002/11/12 12:36:30 ukai Exp $
+$Id: ChangeLog,v 1.503 2002/11/12 12:41:57 ukai Exp $
diff --git a/gcmain.c b/gcmain.c
deleted file mode 100644
index d6a04e4..0000000
--- a/gcmain.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id: gcmain.c,v 1.2 2001/11/20 17:49:23 ukai Exp $ */
-#ifndef GC_MAIN
-#define GC_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 "private/gc_priv.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
-
-#endif
diff --git a/main.c b/main.c
index 138d4aa..2ae90c6 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.128 2002/11/12 12:24:44 ukai Exp $ */
+/* $Id: main.c,v 1.129 2002/11/12 12:41:57 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -98,8 +98,6 @@ static int check_target = TRUE;
#define PREC_LIMIT 10000
static int searchKeyNum(void);
-#include "gcmain.c"
-
#define help() fusage(stdout, 0)
#define usage() fusage(stderr, 1)
@@ -346,7 +344,7 @@ make_optional_header_string(char *s)
}
int
-MAIN(int argc, char **argv, char **envp)
+main(int argc, char **argv, char **envp)
{
Buffer *newbuf = NULL;
char *p, c;
diff --git a/mktable.c b/mktable.c
index d5a424c..f18a57e 100644
--- a/mktable.c
+++ b/mktable.c
@@ -1,4 +1,4 @@
-/* $Id: mktable.c,v 1.9 2002/02/01 13:58:47 inu Exp $ */
+/* $Id: mktable.c,v 1.10 2002/11/12 12:41:58 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -7,8 +7,6 @@
#include "Str.h"
#include <gc.h>
-#include "gcmain.c"
-
/* *INDENT-OFF* */
defhash(HashItem_ss *, int, hss_i)
/* *INDENT-ON* */
@@ -27,7 +25,7 @@ defhashfunc(HashItem_ss *, int, hss_i)
/* *INDENT-ON* */
int
-MAIN(int argc, char *argv[], char **envp)
+main(int argc, char *argv[], char **envp)
{
FILE *f;
Hash_ss *hash;
diff --git a/w3mbookmark.c b/w3mbookmark.c
index 49adff4..09dde2f 100644
--- a/w3mbookmark.c
+++ b/w3mbookmark.c
@@ -1,4 +1,4 @@
-/* $Id: w3mbookmark.c,v 1.5 2001/11/24 02:01:26 ukai Exp $ */
+/* $Id: w3mbookmark.c,v 1.6 2002/11/12 12:41:58 ukai Exp $ */
#ifdef __EMX__
#include <stdlib.h>
#endif
@@ -9,8 +9,6 @@
#include "textlist.h"
#include "parsetag.h"
-#include "gcmain.c"
-
#if LANG == JA
static char *bkmark_src1 = "<html><head><title>Bookmark Registration</title>\n\
<body><h1>ブックマークの登録</h1>\n\n" "<form method=get action=\"file://%s/" W3MBOOKMARK_CMDNAME "\">\n\n" "<input type=hidden name=mode value=register>\n\
@@ -174,7 +172,7 @@ insert_bookmark(char *bmark, struct parsed_tagarg *data)
}
int
-MAIN(int argc, char *argv[], char **envp)
+main(int argc, char *argv[], char **envp)
{
extern char *getenv();
char *qs;
diff --git a/w3mhelperpanel.c b/w3mhelperpanel.c
index 8de5348..dd7b7f7 100644
--- a/w3mhelperpanel.c
+++ b/w3mhelperpanel.c
@@ -1,4 +1,4 @@
-/* $Id: w3mhelperpanel.c,v 1.8 2002/06/01 17:09:05 ukai Exp $ */
+/* $Id: w3mhelperpanel.c,v 1.9 2002/11/12 12:41:58 ukai Exp $ */
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
@@ -9,8 +9,6 @@
#include "parsetag.h"
#include "myctype.h"
-#include "gcmain.c"
-
#if LANG == JA
#define MSG_TITLE "外部ビューアの編集"
#define MSG_NEW_ENTRY "新規登録"
@@ -157,7 +155,7 @@ editMailcap(char *mailcap, struct parsed_tagarg *args)
}
int
-MAIN(int argc, char *argv[], char **envp)
+main(int argc, char *argv[], char **envp)
{
Str mailcapfile;
extern char *getenv();