commit 73ed90984d8397b63748aedd161adc5dff8570d9
parent 4d1e459b77c9fd56384555d68c1c817b8ecd09a6
Author: Remy Noulin <loader2x@gmail.com>
Date: Mon, 24 Feb 2025 08:04:53 +0200
Fix variable name collision in sliceFrom and staticSliceFrom macros
release/libsheepy.h | 10 +++++-----
src/libsheepy.h | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
Diffstat:
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/release/libsheepy.h b/release/libsheepy.h
@@ -98,7 +98,7 @@
// version accoring to the version package: Release.Major.minor.patch
// https://noulin.net/version/file/README.md.html
-#define LIBSHEEPY_VERSION "2.2.16.2"
+#define LIBSHEEPY_VERSION "2.2.16.3"
#ifndef SH_PREFIX
#define SH_PREFIX(NAME) NAME
@@ -3629,9 +3629,9 @@ void **iListDel(void ***list, int64_t start, int64_t end) MUST_CHECK;
/**
* copy data from array to slice
*/
-#define sliceFrom(name, array, countInt) do{\
+#define sliceFrom(name, arrayIn, countInt) do{\
var UNIQVAR(c) = countInt;\
- var UNIQVAR(a) = array;\
+ var UNIQVAR(a) = arrayIn;\
if (sizeof((name)->array[0]) == sizeof(*(UNIQVAR(a)))) {\
sliceResize(name, UNIQVAR(c));\
memcpy((name)->array, UNIQVAR(a), UNIQVAR(c) * sizeof UNIQVAR(a)[0]);\
@@ -4413,9 +4413,9 @@ void **iListDel(void ***list, int64_t start, int64_t end) MUST_CHECK;
/**
* copy data from array to staticSlice
*/
-#define staticSliceFrom(name, array, countInt) do{\
+#define staticSliceFrom(name, arrayIn, countInt) do{\
var UNIQVAR(c) = countInt;\
- var UNIQVAR(a) = array;\
+ var UNIQVAR(a) = arrayIn;\
if (sizeof((name)->array[0]) == sizeof(*(UNIQVAR(a))) /* slice compatibility and UNIQVAR(c) <= ARRAY_SIZE((name)->array)*/) {\
memcpy((name)->array, UNIQVAR(a), UNIQVAR(c) * sizeof UNIQVAR(a)[0]);\
(name)->count = UNIQVAR(c);\
diff --git a/src/libsheepy.h b/src/libsheepy.h
@@ -98,7 +98,7 @@
// version accoring to the version package: Release.Major.minor.patch
// https://noulin.net/version/file/README.md.html
-#define LIBSHEEPY_VERSION "2.2.16.2"
+#define LIBSHEEPY_VERSION "2.2.16.3"
#ifndef SH_PREFIX
#define SH_PREFIX(NAME) NAME
@@ -3629,9 +3629,9 @@ void **iListDel(void ***list, int64_t start, int64_t end) MUST_CHECK;
/**
* copy data from array to slice
*/
-#define sliceFrom(name, array, countInt) do{\
+#define sliceFrom(name, arrayIn, countInt) do{\
var UNIQVAR(c) = countInt;\
- var UNIQVAR(a) = array;\
+ var UNIQVAR(a) = arrayIn;\
if (sizeof((name)->array[0]) == sizeof(*(UNIQVAR(a)))) {\
sliceResize(name, UNIQVAR(c));\
memcpy((name)->array, UNIQVAR(a), UNIQVAR(c) * sizeof UNIQVAR(a)[0]);\
@@ -4413,9 +4413,9 @@ void **iListDel(void ***list, int64_t start, int64_t end) MUST_CHECK;
/**
* copy data from array to staticSlice
*/
-#define staticSliceFrom(name, array, countInt) do{\
+#define staticSliceFrom(name, arrayIn, countInt) do{\
var UNIQVAR(c) = countInt;\
- var UNIQVAR(a) = array;\
+ var UNIQVAR(a) = arrayIn;\
if (sizeof((name)->array[0]) == sizeof(*(UNIQVAR(a))) /* slice compatibility and UNIQVAR(c) <= ARRAY_SIZE((name)->array)*/) {\
memcpy((name)->array, UNIQVAR(a), UNIQVAR(c) * sizeof UNIQVAR(a)[0]);\
(name)->count = UNIQVAR(c);\