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

1 files changed, 2 insertions, 0 deletions

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:
  */