Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init

diff --git a/ewah/ewok.h b/ewah/ewok.h
index 6e2c5e1e3d4475b31ba3c556b31b9d5d72e26d59..269a1a87063af0d89ab4b7569f0193e08bd98bf3 100644 (file)
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -20,16 +20,6 @@
 #ifndef __EWOK_BITMAP_H__
 #define __EWOK_BITMAP_H__
 
-#ifndef ewah_malloc
-#      define ewah_malloc xmalloc
-#endif
-#ifndef ewah_realloc
-#      define ewah_realloc xrealloc
-#endif
-#ifndef ewah_calloc
-#      define ewah_calloc xcalloc
-#endif
-
 struct strbuf;
 typedef uint64_t eword_t;
 #define BITS_IN_EWORD (sizeof(eword_t) * 8)