The branch, master has been updated via 412b89afbab91e3c104b012a2c1ec8b770ee6ab8 (commit) via 21522e4a9a3b223d29858cb35fe5e61ef8faf5b0 (commit) from ae19f5acddee6d6507225c0c9a625383255a6d4c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 412b89afbab91e3c104b012a2c1ec8b770ee6ab8 Author: Stefan Metzmacher <me...@samba.org> Date: Sat Jan 31 09:32:14 2009 +0100 lib/replace: move MAXHOSTNAMELEN to system/network.h Some platforms define it in netdb.h, so we should define the replace after including metdb.h. metze commit 21522e4a9a3b223d29858cb35fe5e61ef8faf5b0 Author: Stefan Metzmacher <me...@samba.org> Date: Sat Jan 31 09:04:12 2009 +0100 s4:heimdal_build: fix the build of asn1_compile and compile_et We should not link in heimdal_build/replace.ho twice. HEIMDAL_ROKEN has everything we need.... metze ----------------------------------------------------------------------- Summary of changes: lib/replace/replace.h | 12 ------------ lib/replace/system/network.h | 6 +++++- source4/heimdal_build/internal.mk | 6 ++---- 3 files changed, 7 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/replace.h b/lib/replace/replace.h index 688a746..c5b8676 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -503,18 +503,6 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) #define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t))) -#ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 255 -#endif - -/* - * Some older systems seem not to have MAXHOSTNAMELEN - * defined. - */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN HOST_NAME_MAX -#endif - #ifndef UINT16_MAX #define UINT16_MAX 65535 #endif diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index 473d79b..40d20db 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -271,7 +271,11 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]); #endif #ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 256 +#define HOST_NAME_MAX 255 +#endif + +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN HOST_NAME_MAX #endif #ifndef HAVE_SA_FAMILY_T diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index 92bef08..9e32898 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -656,7 +656,7 @@ HEIMDAL_COM_ERR_OBJ_FILES = \ # Start BINARY asn1_compile [BINARY::asn1_compile] USE_HOSTCC = YES -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN LIBREPLACE_NETWORK +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN ASN1C = $(builddir)/bin/asn1_compile @@ -682,7 +682,6 @@ asn1_compile_OBJ_FILES = \ $(asn1_compile_ASN1_OBJ_FILES) \ $(heimdalsrcdir)/lib/vers/print_version.ho \ $(socketwrappersrcdir)/socket_wrapper.ho \ - $(heimdalbuildsrcdir)/replace.ho $(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) @@ -700,7 +699,7 @@ $(eval $(call heimdal_proto_header_template, \ # Start BINARY compile_et [BINARY::compile_et] USE_HOSTCC = YES -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN LIBREPLACE_NETWORK +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN # End BINARY compile_et ####################### @@ -711,7 +710,6 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ $(heimdalsrcdir)/lib/com_err/lex.ho \ $(heimdalsrcdir)/lib/com_err/compile_et.ho \ $(socketwrappersrcdir)/socket_wrapper.ho \ - $(heimdalbuildsrcdir)/replace.ho $(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) -- Samba Shared Repository