git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Events: move from Experimental to mainline
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 6bd33a1a574959f9f690571574a5cec67cf2af65..0edb169623afb9463fee8b013ee2a948cff4649c 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-178,7
+178,7
@@
BOOL prdr_requested = FALSE;
const pcre *regex_PRDR = NULL;
#endif
const pcre *regex_PRDR = NULL;
#endif
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
const pcre *regex_UTF8 = NULL;
#endif
const pcre *regex_UTF8 = NULL;
#endif
@@
-395,7
+395,7
@@
address_item address_defaults = {
#ifdef EXPERIMENTAL_SRS
NULL, /* srs_sender */
#endif
#ifdef EXPERIMENTAL_SRS
NULL, /* srs_sender */
#endif
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
FALSE, /* utf8 */
#endif
}
FALSE, /* utf8 */
#endif
}
@@
-690,7
+690,7
@@
uschar *errors_copy = NULL;
int error_handling = ERRORS_SENDER;
uschar *errors_reply_to = NULL;
int errors_sender_rc = EXIT_FAILURE;
int error_handling = ERRORS_SENDER;
uschar *errors_reply_to = NULL;
int errors_sender_rc = EXIT_FAILURE;
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
uschar *event_action = NULL; /* expansion for delivery events */
uschar *event_data = NULL; /* auxilary data variable for event */
int event_defer_errno = 0;
uschar *event_action = NULL; /* expansion for delivery events */
uschar *event_data = NULL; /* auxilary data variable for event */
int event_defer_errno = 0;
@@
-943,7
+943,7
@@
int message_linecount = 0;
BOOL message_logs = TRUE;
int message_size = 0;
uschar *message_size_limit = US"50M";
BOOL message_logs = TRUE;
int message_size = 0;
uschar *message_size_limit = US"50M";
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
BOOL message_smtputf8 = FALSE;
int message_utf8_downconvert = 0; /* -1 ifneeded; 0 never; 1 always */
#endif
BOOL message_smtputf8 = FALSE;
int message_utf8_downconvert = 0; /* -1 ifneeded; 0 never; 1 always */
#endif
@@
-1316,7
+1316,7
@@
int smtp_rlr_limit = 0;
int smtp_rlr_threshold = INT_MAX;
BOOL smtp_use_pipelining = FALSE;
BOOL smtp_use_size = FALSE;
int smtp_rlr_threshold = INT_MAX;
BOOL smtp_use_pipelining = FALSE;
BOOL smtp_use_size = FALSE;
-#ifdef
EXPERIMENTAL_INTERNATIONAL
+#ifdef
SUPPORT_I18N
uschar *smtputf8_advertise_hosts = US"*"; /* overridden under test-harness */
#endif
uschar *smtputf8_advertise_hosts = US"*"; /* overridden under test-harness */
#endif
@@
-1446,7
+1446,7
@@
transport_instance transport_defaults = {
FALSE, /* log_defer_output */
TRUE_UNSET /* retry_use_local_part: BOOL, but set neither
1 nor 0 so can detect unset */
FALSE, /* log_defer_output */
TRUE_UNSET /* retry_use_local_part: BOOL, but set neither
1 nor 0 so can detect unset */
-#if
def EXPERIMENTAL
_EVENT
+#if
ndef DISABLE
_EVENT
,NULL /* event_action */
#endif
};
,NULL /* event_action */
#endif
};