diff options
author | AIDA Shinra <shinra@j10n.org> | 2013-10-14 13:31:01 +0000 |
---|---|---|
committer | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 13:31:01 +0000 |
commit | ec81194f386f35b0d914e0fc5c727cd217c62c91 (patch) | |
tree | 1a64910741c607abe7d19b92bdfa34f3506507ae /fm.h | |
parent | Merge from upstream on 2012-05-22 (diff) | |
download | w3m-ec81194f386f35b0d914e0fc5c727cd217c62c91.tar.gz w3m-ec81194f386f35b0d914e0fc5c727cd217c62c91.zip |
Workaround of GC crash on Cygwin64
Patch from <http://www.j10n.org/files/w3m-cvs-1.1055-win64gc.patch>,
[w3m-dev:04469] on 2013-10-14.
Diffstat (limited to 'fm.h')
-rw-r--r-- | fm.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -76,6 +76,7 @@ typedef int wc_ces; /* XXX: not used */ #include "textlist.h" #include "funcname1.h" #include "terms.h" +#include "istream.h" #ifndef HAVE_BCOPY void bcopy(const void *, void *, int); @@ -276,8 +277,6 @@ extern int REV_LB[]; #define inputFilenameHist(p,d,h) inputLineHist(p,d,IN_FILENAME,h) #define inputChar(p) inputLine(p,"",IN_CHAR) -#define free(x) GC_free(x) /* let GC do it. */ - #ifdef __EMX__ #define HAVE_STRCASECMP #define strcasecmp stricmp @@ -874,6 +873,9 @@ global char *index_file init(NULL); global char *CurrentDir; global int CurrentPid; +#if defined(DONT_CALL_GC_AFTER_FORK) && defined(USE_IMAGE) +global char *MyProgramName init("w3m"); +#endif /* defined(DONT_CALL_GC_AFTER_FORK) && defined(USE_IMAGE) */ /* * global Buffer *Currentbuf; * global Buffer *Firstbuf; |