diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 14:02:26 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 14:02:26 +0000 |
| commit | f7ff70f6da9f70e21c690f1d11a695de7536bf6f (patch) | |
| tree | 42815fcf0bf71d5944461cb83f3f779138080d80 /fm.h | |
| parent | Merge branch 'feature/debian-version' (diff) | |
| parent | Workaround of GC crash on Cygwin64 (diff) | |
| download | w3m-f7ff70f6da9f70e21c690f1d11a695de7536bf6f.tar.gz w3m-f7ff70f6da9f70e21c690f1d11a695de7536bf6f.zip | |
Merge branch 'bug/win64gc'
Conflicts:
istream.c
main.c
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); @@ -288,8 +289,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 @@ -895,6 +894,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; |