commit a8705a3a2538dc19fbe9385a5b16217039da903e
parent a6318779f52c7ce2bb7e4af4c5967b769de4c44a
Author: ukai <ukai>
Date: Tue, 12 Nov 2002 12:41:57 +0000
[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
From: Akira TAGOH <at@gclab.org>
Diffstat:
6 files changed, 14 insertions(+), 40 deletions(-)
diff --git 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
diff --git a/gcmain.c b/gcmain.c
@@ -1,28 +0,0 @@
-/* $Id$ */
-#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
@@ -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
@@ -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
@@ -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
@@ -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();
