From aa38afe91fea0521383bc906826f7b3a3ab480c8 Mon Sep 17 00:00:00 2001
From: rofl0r <retnyg@gmx.net>
Date: Sat, 5 Oct 2013 06:45:21 +0200
Subject: [PATCH] make mymem* macros if available in libc

---
 hexedit.h |  8 ++++++++
 misc.c    | 12 ++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/hexedit.h b/hexedit.h
index f5ff277..46a5e8e 100644
--- a/hexedit.h
+++ b/hexedit.h
@@ -185,8 +185,16 @@ int setHighBits(int p, int val);
 char *strconcat3(char *a, char *b, char *c);
 int hexCharToInt(int c);
 int not(int b);
+#ifndef HAVE_MEMMEM
 char *mymemmem(char *a, size_t sizea, char *b, size_t sizeb);
+#else
+#define mymemmem(a,b,c,d) memmem(a,b,c,d)
+#endif
+#ifndef HAVE_MEMRMEM
 char *mymemrmem(char *a, size_t sizea, char *b, size_t sizeb);
+#else
+#define mymemrmem(a,b,c,d) memrmem(a,b,c,d)
+#endif
 int is_file(char *name);
 int hexStringToBinString(char *p, size_t *l);
 
diff --git a/misc.c b/misc.c
index fe0202f..fc9a054 100644
--- a/misc.c
+++ b/misc.c
@@ -81,11 +81,9 @@ void *memrchr(const void *s, int c, size_t n)
 }
 #endif
 
+#ifndef HAVE_MEMMEM
 char *mymemmem(char *a, size_t sizea, char *b, size_t sizeb)
 {
-#ifdef HAVE_MEMMEM
-  return memmem(a, sizea, b, sizeb);
-#else
   char *p;
   ssize_t i = sizea - sizeb + 1;
   if (i < 0) return 0;
@@ -96,14 +94,12 @@ char *mymemmem(char *a, size_t sizea, char *b, size_t sizeb)
     }
   }
   return NULL;
-#endif
 }
+#endif
 
+#ifndef HAVE_MEMRMEM
 char *mymemrmem(char *a, size_t sizea, char *b, size_t sizeb)
 {
-#ifdef HAVE_MEMRMEM
-  return memrmem(a, sizea, b, sizeb);
-#else
   char *p;
   ssize_t i = sizea - sizeb + 1;
   if (i < 0) return 0;
@@ -114,8 +110,8 @@ char *mymemrmem(char *a, size_t sizea, char *b, size_t sizeb)
     if ((memcmp(p - sizeb + 1, b, sizeb - 1)) == 0) return p;
   }
   return NULL;
-#endif
 }
+#endif
 
 
 int hexStringToBinString(char *p, size_t *l)
-- 
2.11.4.GIT