Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndris Zeila <andris.zeila@zabbix.com>2021-04-13 11:41:50 +0300
committerAndris Zeila <andris.zeila@zabbix.com>2021-04-13 11:41:50 +0300
commit0ba133694812ce2e585405fbd30748503f0bde2a (patch)
treeb59c19b919391c3c71ffb0f7fe54588f5ff8b2a5 /include/zbxserver.h
parent3f5a5ff05b51000d7f66894a2d5759d81cf95563 (diff)
parent8ab856e081ff677445032bf8ea297af5fda366e9 (diff)
.......... [ZBXNEXT-6457] merged branch 'feature/ZBXNEXT-6451-5.3' into feature/ZBXNEXT-6457-5.3
Diffstat (limited to 'include/zbxserver.h')
-rw-r--r--include/zbxserver.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h
index 255e2f38676..33838a8ada3 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -50,10 +50,9 @@
#define MACRO_TYPE_ALLOWED_HOSTS 0x00800000
#define MACRO_TYPE_ITEM_TAG 0x01000000
#define MACRO_TYPE_EVENT_NAME 0x02000000 /* event name in trigger configuration */
-#define MACRO_TYPE_EXPRESSION 0x04000000 /* macros in expression macro */
-#define MACRO_TYPE_SCRIPT_PARAMS_FIELD 0x08000000
-#define MACRO_TYPE_SCRIPT_NORMAL 0x10000000
-#define MACRO_TYPE_SCRIPT_RECOVERY 0x20000000
+#define MACRO_TYPE_SCRIPT_PARAMS_FIELD 0x04000000
+#define MACRO_TYPE_SCRIPT_NORMAL 0x08000000
+#define MACRO_TYPE_SCRIPT_RECOVERY 0x10000000
#define MACRO_EXPAND_NO 0
#define MACRO_EXPAND_YES 1