diff options
Diffstat (limited to '')
| -rw-r--r-- | config.h.dist | 7 | ||||
| -rw-r--r-- | config.h.in | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/config.h.dist b/config.h.dist index 844a555..4f31fea 100644 --- a/config.h.dist +++ b/config.h.dist @@ -9,10 +9,10 @@ /* User Configuration */ /* - If you define DICT, you can use dictionary look-up function + If you define USE_DICT, you can use dictionary look-up function in w3m. See README.dict for detail. */ -#define DICT +#define USE_DICT /* If you want to load and save URL history. @@ -138,6 +138,7 @@ INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM) #undef USE_W3MIMG_FB #undef USE_IMLIB #undef USE_GDKPIXBUF +#undef X_DISPLAY_MISSING #undef USE_IMLIB2 #define USE_HELP_CGI #undef USE_XFACE @@ -194,7 +195,6 @@ typedef long clen_t; #define HAVE_STRCASESTR #define HAVE_STRCHR #define HAVE_STRERROR -#define HAVE_SYS_ERRLIST #define HAVE_BCOPY #define HAVE_WAITPID #define HAVE_WAIT3 @@ -210,6 +210,7 @@ typedef long clen_t; #define HAVE_SRANDOM #undef HAVE_GETPASSPHRASE #define HAVE_CHDIR +#define HAVE_MKDTEMP #define SETJMP(env) sigsetjmp(env,1) diff --git a/config.h.in b/config.h.in index 2f41eed..6bb0ee0 100644 --- a/config.h.in +++ b/config.h.in @@ -25,6 +25,7 @@ #define PASSWD_FILE RC_DIR "/passwd" #define PRE_FORM_FILE RC_DIR "/pre_form" +#define SITECONF_FILE RC_DIR "/siteconf" #define USER_MAILCAP RC_DIR "/mailcap" #define SYS_MAILCAP CONF_DIR "/mailcap" #define USER_MIMETYPES "~/.mime.types" @@ -74,6 +75,7 @@ #undef USE_IMLIB #undef USE_GDKPIXBUF #undef USE_GTK2 +#undef X_DISPLAY_MISSING #undef USE_IMLIB2 #undef USE_XFACE #undef USE_DICT @@ -84,7 +86,7 @@ #undef INET6 #undef HAVE_SOCKLEN_T #undef HAVE_OLD_SS_FAMILY -#define USE_EGD +#undef USE_EGD #define ENABLE_REMOVE_TRAILINGSPACES #undef MENU_THIN_FRAME #undef USE_RAW_SCROLL @@ -126,7 +128,6 @@ typedef long clen_t; #undef HAVE_STRCASESTR #undef HAVE_STRCHR #undef HAVE_STRERROR -#undef HAVE_SYS_ERRLIST #undef HAVE_BCOPY #undef HAVE_WAITPID #undef HAVE_WAIT3 @@ -142,6 +143,7 @@ typedef long clen_t; #undef HAVE_SRANDOM #undef HAVE_GETPASSPHRASE #undef HAVE_CHDIR +#undef HAVE_MKDTEMP #undef HAVE_SETPGRP #undef HAVE_SETLOCALE #undef HAVE_LANGINFO_CODESET @@ -179,7 +181,7 @@ typedef RETSIGTYPE MySignalHandler; #endif /* __MINGW32_VERSION */ #else # define SETJMP(env) setjmp(env) -# define LONGJMP(env,val) longjmp(env) +# define LONGJMP(env,val) longjmp(env, val) # define JMP_BUF jmp_buf #endif @@ -209,6 +211,10 @@ typedef RETSIGTYPE MySignalHandler; #define SUPPORT_WIN9X_CONSOLE_MBCS 1 #endif +#if defined(__CYGWIN__) && defined(__x86_64__) +#define DONT_CALL_GC_AFTER_FORK +#endif + #if defined(__DJGPP__) #define DEFAULT_TERM "dosansi" #else |