diff options
| -rw-r--r-- | source4/heimdal/lib/roken/err.hin | 88 | ||||
| -rwxr-xr-x | source4/heimdal_build/build_external.sh | 1 | ||||
| -rw-r--r-- | source4/heimdal_build/config.h | 4 | ||||
| -rw-r--r-- | source4/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/lib/replace/replace.h | 4 |
5 files changed, 93 insertions, 8 deletions
diff --git a/source4/heimdal/lib/roken/err.hin b/source4/heimdal/lib/roken/err.hin new file mode 100644 index 0000000000..fcae879279 --- /dev/null +++ b/source4/heimdal/lib/roken/err.hin @@ -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__ */ diff --git a/source4/heimdal_build/build_external.sh b/source4/heimdal_build/build_external.sh index 5b512899cc..c3a29595db 100755 --- a/source4/heimdal_build/build_external.sh +++ b/source4/heimdal_build/build_external.sh @@ -85,6 +85,7 @@ build_cp() { } 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 diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 97c972799b..541729f7ad 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -17,10 +17,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } #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" diff --git a/source4/include/includes.h b/source4/include/includes.h index 3fe3b78c90..5a86aa7218 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -192,6 +192,10 @@ extern int DEBUGLEVEL; #define ssize_t int #endif +#ifndef UINT16_MAX +#define UINT16_MAX 65535 +#endif + /* type safe varient of smb_xmalloc() */ diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index 8062c4c683..89225d3d65 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -109,10 +109,6 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #define VA_COPY(dest, src) (dest) = (src) #endif -#ifndef UINT16_MAX -#define UINT16_MAX 65535 -#endif - #if defined(HAVE_VOLATILE) #define VOLATILE volatile #else |