[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2168-gb258c5f

[Andrew Tridgell]

The branch, master has been updated
       via  b258c5fa67a8597e6d3fb0c55797f0a451e331b0 (commit)
      from  03dd06de9ae7b3692fd2ab141c0522abacbaec31 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b258c5fa67a8597e6d3fb0c55797f0a451e331b0
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Jun 9 14:11:20 2009 +1000

    work around conflict in pidfile() prototype for heimdal on NetBSD5

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal_build/roken.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index e3edd53..4eabbe2 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -85,6 +85,13 @@
 #define HAVE_INNETGR
 #endif
 
+/* we lie about having pidfile() so that NetBSD5 can compile. Nothing
+   in the parts of heimdal we use actually uses pidfile(), and we
+   don't use it in Samba, so this works, although its ugly */
+#ifndef HAVE_PIDFILE
+#define HAVE_PIDFILE
+#endif
+
 #if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
 #ifndef HAVE___ATTRIBUTE__
 #define HAVE___ATTRIBUTE__


-- 
Samba Shared Repository