The branch, master has been updated via acedd1c... s3: fix build on Tru64 after it broke with deactivating pthread pool support via ae95e80... s3:vfs_scannedonly: fix build on HP-UX from bb83ffd... net: Fix python 2.4 compatibility.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit acedd1c8320afa672ca70c6594bc90ccb7e75a6a Author: Björn Jacke <b...@sernet.de> Date: Thu Feb 4 10:35:45 2010 +0100 s3: fix build on Tru64 after it broke with deactivating pthread pool support commit ae95e8028c294ee1e2dc66a7a62d006572142629 Author: Björn Jacke <b...@sernet.de> Date: Wed Feb 3 23:28:38 2010 +0100 s3:vfs_scannedonly: fix build on HP-UX ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 9 ++++++--- source3/modules/vfs_scannedonly.c | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 6edb339..cd112f7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -73,6 +73,7 @@ uuid_li...@uuid_libs@ libwbclie...@libwbclient_static@ @LIBWBCLIENT_SHARED@ libwbclient_li...@libwbclient_libs@ pthread_ldfla...@pthread_ldflags@ +pthread_cfla...@pthread_cflags@ dnssd_li...@dnssd_libs@ avahi_li...@avahi_libs@ popt_li...@poptlibs@ @@ -1409,6 +1410,8 @@ wins : SHOWFLAGS @WINBIND_WINS_NSS@ modules:: SHOWFLAGS $(MODULES) +$(LIBSMBCLIENT_THREAD_OBJ): EXTRA_FLAGS := $(PTHREAD_CFLAGS) + ##################################################################### ## Perl IDL Compiler samba3-idl:: @@ -1467,11 +1470,11 @@ MAKEDIR = || exec false; \ exec false; fi || exec false # Run a static checker. -CHECK_CC = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) -c $< -o $@ +CHECK_CC = $(CC_CHECKER) $(CFLAGS) $(EXTRA_FLAGS) $(PICFLAG) -c $< -o $@ # Compile a source file. -COMPILE_CC = $(CC) $(CFLAGS) $(PICFLAG) -c $< -o $@ +COMPILE_CC = $(CC) $(CFLAGS) $(EXTRA_FLAGS) $(PICFLAG) -c $< -o $@ # Compile a source file with the installation paths defined. -COMPILE_CC_PATH = $(CC) $(PATH_FLAGS) $(CFLAGS) $(PICFLAG) -c $< -o $@ +COMPILE_CC_PATH = $(CC) $(PATH_FLAGS) $(CFLAGS) $(EXTRA_FLAGS) $(PICFLAG) -c $< -o $@ COMPILE = $(COMPILE_CC) diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c index 20c54fb..42e9aec 100644 --- a/source3/modules/vfs_scannedonly.c +++ b/source3/modules/vfs_scannedonly.c @@ -53,6 +53,12 @@ #define SENDBUFFERSIZE 1450 +#ifndef SUN_LEN +#define SUN_LEN(sunp) ((size_t)((struct sockaddr_un *)0)->sun_path \ + + strlen((sunp)->sun_path)) +#endif + + struct Tscannedonly { int socket; int domain_socket; -- Samba Shared Repository