svn commit: samba r8420 - in branches/SAMBA_4_0/source:
heimdal/lib/roken heimdal_build include lib/replace
tridge at samba.org
tridge at samba.org
Wed Jul 13 11:17:33 GMT 2005
Author: tridge
Date: 2005-07-13 11:17:32 +0000 (Wed, 13 Jul 2005)
New Revision: 8420
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8420
Log:
slowly getting my way through some more heimdal portability fixes
Added:
branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin
Modified:
branches/SAMBA_4_0/source/heimdal/lib/roken/
branches/SAMBA_4_0/source/heimdal_build/build_external.sh
branches/SAMBA_4_0/source/heimdal_build/config.h
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/lib/replace/replace.h
Changeset:
Property changes on: branches/SAMBA_4_0/source/heimdal/lib/roken
___________________________________________________________________
Name: svn:ignore
- vis.h
+ vis.h
err.h
Added: branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin
===================================================================
--- branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin 2005-07-13 11:02:56 UTC (rev 8419)
+++ branches/SAMBA_4_0/source/heimdal/lib/roken/err.hin 2005-07-13 11:17:32 UTC (rev 8420)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 1995 - 2004 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* $Id: err.hin,v 1.18 2005/04/12 11:28:38 lha Exp $ */
+
+#ifndef __ERR_H__
+#define __ERR_H__
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#if !defined(__GNUC__) && !defined(__attribute__)
+#define __attribute__(x)
+#endif
+
+#ifndef ROKEN_LIB_FUNCTION
+#ifdef _WIN32
+#define ROKEN_LIB_FUNCTION _stdcall
+#else
+#define ROKEN_LIB_FUNCTION
+#endif
+#endif
+
+void ROKEN_LIB_FUNCTION
+verr(int eval, const char *fmt, va_list ap)
+ __attribute__ ((noreturn, format (printf, 2, 0)));
+
+void ROKEN_LIB_FUNCTION
+err(int eval, const char *fmt, ...)
+ __attribute__ ((noreturn, format (printf, 2, 3)));
+
+void ROKEN_LIB_FUNCTION
+verrx(int eval, const char *fmt, va_list ap)
+ __attribute__ ((noreturn, format (printf, 2, 0)));
+
+void ROKEN_LIB_FUNCTION
+errx(int eval, const char *fmt, ...)
+ __attribute__ ((noreturn, format (printf, 2, 3)));
+void ROKEN_LIB_FUNCTION
+vwarn(const char *fmt, va_list ap)
+ __attribute__ ((format (printf, 1, 0)));
+
+void ROKEN_LIB_FUNCTION
+warn(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));
+
+void ROKEN_LIB_FUNCTION
+vwarnx(const char *fmt, va_list ap)
+ __attribute__ ((format (printf, 1, 0)));
+
+void ROKEN_LIB_FUNCTION
+warnx(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2)));
+
+#endif /* __ERR_H__ */
Modified: branches/SAMBA_4_0/source/heimdal_build/build_external.sh
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/build_external.sh 2005-07-13 11:02:56 UTC (rev 8419)
+++ branches/SAMBA_4_0/source/heimdal_build/build_external.sh 2005-07-13 11:17:32 UTC (rev 8420)
@@ -85,6 +85,7 @@
}
build_cp heimdal/lib/roken/vis.hin
+build_cp heimdal/lib/roken/err.hin
build_lex heimdal/lib/asn1/lex.l
build_lex heimdal/lib/com_err/lex.l
build_bison heimdal/lib/com_err/parse.y
Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.h 2005-07-13 11:02:56 UTC (rev 8419)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h 2005-07-13 11:17:32 UTC (rev 8420)
@@ -17,10 +17,6 @@
#define SIGRETURN(x) return (RETSIGTYPE)(x)
#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN (1024+4)
-#endif
-
/* path to sysconf - should we force this to samba LIBDIR ? */
#define SYSCONFDIR "/etc"
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2005-07-13 11:02:56 UTC (rev 8419)
+++ branches/SAMBA_4_0/source/include/includes.h 2005-07-13 11:17:32 UTC (rev 8420)
@@ -192,6 +192,10 @@
#define ssize_t int
#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX 65535
+#endif
+
/*
type safe varient of smb_xmalloc()
*/
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2005-07-13 11:02:56 UTC (rev 8419)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2005-07-13 11:17:32 UTC (rev 8420)
@@ -109,10 +109,6 @@
#define VA_COPY(dest, src) (dest) = (src)
#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
-#endif
-
#if defined(HAVE_VOLATILE)
#define VOLATILE volatile
#else
More information about the samba-cvs
mailing list