summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-25 16:44:50 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-31 00:32:07 +0200
commitb19fe1995ac5359b61eb9ff87bf6d800bb904cb8 (patch)
tree23b1a2c4ff39cf7418f63a706d97ee3d79ff5353 /source4
parent33e8126c3c810388d079008d6de8291a294b9bd8 (diff)
downloadsamba-b19fe1995ac5359b61eb9ff87bf6d800bb904cb8.tar.gz
samba-b19fe1995ac5359b61eb9ff87bf6d800bb904cb8.tar.bz2
samba-b19fe1995ac5359b61eb9ff87bf6d800bb904cb8.zip
heimdal_build: Don't use heimdal's getprogname() and setprogname()
Writing into an __progname variable spooks me, and if we use the local variable, then we duplciate the system one, which fails SYMBOLCHECK Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/replace.c17
-rw-r--r--source4/heimdal_build/wscript_build6
2 files changed, 17 insertions, 6 deletions
diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c
index 51393f6e68..e6a74f9ba8 100644
--- a/source4/heimdal_build/replace.c
+++ b/source4/heimdal_build/replace.c
@@ -83,3 +83,20 @@
return -1;
}
#endif
+
+#ifndef HAVE_SETPROGNAME
+
+/* We don't want to use a setprogname reimplementation */
+void setprogname(const char *argv0)
+{
+}
+
+#endif /* HAVE_SETPROGNAME */
+
+#ifndef HAVE_GETPROGNAME
+/* We don't want to use a getprogname reimplementation */
+const char *getprogname(void)
+{
+ return "";
+}
+#endif /* HAVE_GETPROGNAME */
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index b52acd6661..705caa52e2 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -400,12 +400,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
../heimdal_build/replace.c
'''
- if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
- ROKEN_HOSTCC_SOURCE += '''
- lib/roken/getprogname.c
- lib/roken/setprogname.c
- '''
-
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
ROKEN_HOSTCC_SOURCE += '''
lib/roken/closefrom.c