From: Peter Eriksson <pen@lysator.liu.se>
Date: Thu, 27 Feb 2020 19:54:52 +0000 (+0100)
Subject: Undef ARRAY_SIZE, if defined, before define to avoid compilation warnings
X-Git-Tag: ldb-2.2.0~1557
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7678032272b36e7c502a824340e9f16a57243e50;p=thirdparty%2Fsamba.git

Undef ARRAY_SIZE, if defined, before define to avoid compilation warnings

Signed-off-by: Peter Eriksson <pen@lysator.liu.se>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Gary Lockyer <<gary@catalyst.net.nz>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Feb 27 21:43:29 UTC 2020 on sn-devel-184
---

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 3f6b1380e0c..177be37edbe 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -844,6 +844,9 @@ typedef unsigned long long ptrdiff_t ;
 /**
  * Work out how many elements there are in a static array.
  */
+#ifdef ARRAY_SIZE
+#undef ARRAY_SIZE
+#endif
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
 
 /**