aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2025-05-30 14:13:29 +0000
committerLaurent Bercot <ska@appnovation.com>2025-05-30 14:13:29 +0000
commit359693d4323b6c912447dec1291bef7a83db8bec (patch)
tree37f863bda358f7e5e1b45504456a8c6b623c4d56
parent4b8145a4fc9a8837d91f02bf25b4112ba0dc4e4c (diff)
downloadexecline-359693d4323b6c912447dec1291bef7a83db8bec.tar.gz
Do not conflict with main_func in skalibs
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rwxr-xr-xtools/gen-multicall.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/gen-multicall.sh b/tools/gen-multicall.sh
index e862f0d..7a359b4 100755
--- a/tools/gen-multicall.sh
+++ b/tools/gen-multicall.sh
@@ -20,14 +20,14 @@ cat <<EOF
#include <skalibs/posixishard.h>
-typedef int main_func (int, char **, char const *const *) ;
-typedef main_func *main_func_ref ;
+typedef int emain_func (int, char **, char const *const *) ;
+typedef emain_func *emain_func_ref ;
typedef struct execline_app_s execline_app, *execline_app_ref ;
struct execline_app_s
{
char const *name ;
- main_func_ref mainf ;
+ emain_func_ref mainf ;
} ;
static int execline_app_cmp (void const *a, void const *b)
@@ -67,11 +67,11 @@ EOF
for i in `{ echo cd ; echo execline ; echo umask ; ls -1 src/execline/deps-exe ; } | sort` ; do
j=`echo $i | tr - _`
if test $i = cd ; then
- echo ' { .name = "cd", .mainf = (main_func_ref)&CD_FUNC },'
+ echo ' { .name = "cd", .mainf = (emain_func_ref)&CD_FUNC },'
elif test $i = umask ; then
- echo ' { .name = "umask", .mainf = (main_func_ref)&UMASK_FUNC },'
+ echo ' { .name = "umask", .mainf = (emain_func_ref)&UMASK_FUNC },'
else
- echo " { .name = \"${i}\", .mainf = (main_func_ref)&${j}_main },"
+ echo " { .name = \"${i}\", .mainf = (emain_func_ref)&${j}_main },"
fi
done