[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>
This commit is contained in:
Fumitoshi UKAI
2002-11-12 12:41:57 +00:00
parent 00df4c68e6
commit 467a5e015b
6 changed files with 19 additions and 45 deletions

View File

@@ -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 $

View File

@@ -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

6
main.c
View File

@@ -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;

View File

@@ -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;

View File

@@ -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><3E>֥å<D6A5><C3A5>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͽ</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;

View File

@@ -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 "<22><><EFBFBD><EFBFBD><EFBFBD>ӥ塼<D3A5><E5A1BC><EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD>"
#define MSG_NEW_ENTRY "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͽ"
@@ -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();