From 4ee010a8de7e086d97cebe73ad4c69d91d1ae7f0 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Fri, 8 Apr 2016 12:34:09 -0600 Subject: Reinstate "Make instr() a macro" This reverts commit 2e08dfb2b133af0fbcb4346f8d096ca68454ca54, thus reinstating the commit it reverted. This was delayed until 5.25. The next commit will solve some problems with c++ that this commit causes --- util.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'util.h') diff --git a/util.h b/util.h index 3310b119d8..3a74bd02bd 100644 --- a/util.h +++ b/util.h @@ -229,6 +229,8 @@ means arg not present, 1 is empty string/null byte */ # define HS_CXT cv #endif +#define instr(haystack, needle) strstr(haystack, needle) + /* * ex: set ts=8 sts=4 sw=4 et: */ -- cgit v1.2.1