The branch, master has been updated
via 2fca950d68bff3641ed3ac4bdaee1d16f0cca88a (commit)
via 8447600d98ebb7da47a4815194d29c77225c7bb5 (commit)
from 1f5aec877fc48ff96b14a0e95f01c68a29dd8718 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2fca950d68bff3641ed3ac4bdaee1d16f0cca88a
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jul 15 20:58:11 2009 +0200
s3:libsmb: we need to include "includes.h" as first header to let code
build on all platforms
This should fix the Tru64 build.
metze
commit 8447600d98ebb7da47a4815194d29c77225c7bb5
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jul 15 20:54:01 2009 +0200
s3:tldap: fix the build - a void function should not return a value
metze
-----------------------------------------------------------------------
Summary of changes:
source3/lib/tldap.c | 6 +++---
source3/libsmb/libsmb_thread_posix.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 451bc18..fa56763 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1618,7 +1618,7 @@ struct tevent_req *tldap_add_send(TALLOC_CTX *mem_ctx,
static void tldap_add_done(struct tevent_req *subreq)
{
- return tldap_simple_done(subreq, TLDAP_RES_ADD);
+ tldap_simple_done(subreq, TLDAP_RES_ADD);
}
int tldap_add_recv(struct tevent_req *req)
@@ -1718,7 +1718,7 @@ struct tevent_req *tldap_modify_send(TALLOC_CTX *mem_ctx,
static void tldap_modify_done(struct tevent_req *subreq)
{
- return tldap_simple_done(subreq, TLDAP_RES_MODIFY);
+ tldap_simple_done(subreq, TLDAP_RES_MODIFY);
}
int tldap_modify_recv(struct tevent_req *req)
@@ -1795,7 +1795,7 @@ struct tevent_req *tldap_delete_send(TALLOC_CTX *mem_ctx,
static void tldap_delete_done(struct tevent_req *subreq)
{
- return tldap_simple_done(subreq, TLDAP_RES_DELETE);
+ tldap_simple_done(subreq, TLDAP_RES_DELETE);
}
int tldap_delete_recv(struct tevent_req *req)
diff --git a/source3/libsmb/libsmb_thread_posix.c
b/source3/libsmb/libsmb_thread_posix.c
index 411ffbd..6519659 100644
--- a/source3/libsmb/libsmb_thread_posix.c
+++ b/source3/libsmb/libsmb_thread_posix.c
@@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <pthread.h>
#include "includes.h"
+#include <pthread.h>
#include "libsmbclient.h"
#include "libsmb_internal.h"
--
Samba Shared Repository
