Deleted Added
full compact
0a1,24
> /*
> * Copyright (c) 1999-2003 Damien Miller. 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.
> *
> * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
> */
>
4c28
< /* $Id: defines.h,v 1.97 2003/01/24 00:50:32 djm Exp $ */
---
> /* $Id: defines.h,v 1.103 2003/09/16 01:52:19 dtucker Exp $ */
191d214
< # define HAVE_INT64_T 1
195d217
< # define HAVE_INT64_T 1
202d223
< # define HAVE_U_INT64_T 1
206d226
< # define HAVE_U_INT64_T 1
210,212d229
< #if !defined(HAVE_LONG_LONG_INT) && (SIZEOF_LONG_LONG_INT == 8)
< # define HAVE_LONG_LONG_INT 1
< #endif
306a324,327
> #ifndef SUPERUSER_PATH
> # define SUPERUSER_PATH _PATH_STDPATH
> #endif
>
422a444,460
> /* given pointer to struct cmsghdr, return pointer to data */
> #ifndef CMSG_DATA
> #define CMSG_DATA(cmsg) ((u_char *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))
> #endif /* CMSG_DATA */
>
> /*
> * RFC 2292 requires to check msg_controllen, in case that the kernel returns
> * an empty list for some reasons.
> */
> #ifndef CMSG_FIRSTHDR
> #define CMSG_FIRSTHDR(mhdr) \
> ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
> (struct cmsghdr *)(mhdr)->msg_control : \
> (struct cmsghdr *)NULL)
> #endif /* CMSG_FIRSTHDR */
>
>
489a528,531
> #if defined(KRB5) && !defined(HEIMDAL)
> # define krb5_get_err_text(context,code) error_message(code)
> #endif
>