head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3; locks; strict; comment @# @; 1.3 date 99.03.12.16.29.04; author tron; state dead; branches; next 1.2; 1.2 date 99.03.12.15.58.09; author tron; state Exp; branches; next 1.1; 1.1 date 99.03.12.15.52.10; author tron; state Exp; branches; next ; desc @@ 1.3 log @Update "libident" to version 0.22 and include shared library support. @ text @$NetBSD: patch-ab,v 1.2 1999/03/12 15:58:09 tron Exp $ --- ident.h.orig Thu Nov 23 23:44:36 1995 +++ ident.h Fri Mar 12 16:56:54 1999 @@@@ -13,10 +13,8 @@@@ #endif /* Sigh */ -#ifdef __STDC__ -# if __STDC__ == 1 -# define IS_STDC 1 -# endif +#if (0 - __STDC__) <= -1 +# define IS_STDC 1 #endif #ifdef __P @@@@ -96,34 +94,22 @@@@ # include #endif #include +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #include -#include #if defined(VMS) && !defined(FD_SETSIZE) # define FD_SETSIZE 64 #endif -/* - * Sigh, GCC v2 complains when using undefined struct tags - * in function prototypes... - */ -#if defined(__GNUC__) && !defined(INADDR_ANY) -# define __STRUCT_IN_ADDR_P void * -#else -# define __STRUCT_IN_ADDR_P struct in_addr * -#endif - -#if defined(__GNUC__) && !defined(DST_NONE) -# define __STRUCT_TIMEVAL_P void * -#else -# define __STRUCT_TIMEVAL_P struct timeval * -#endif - -#if defined(__sgi) && defined(_POSIX_SOURCE) -# undef __STRUCT_TIMEVAL_P -# define __STRUCT_TIMEVAL_P void * -#endif - #ifndef IDBUFSIZE # define IDBUFSIZE 2048 #endif @@@@ -149,19 +135,19 @@@@ /* Low-level calls and macros */ #define id_fileno(ID) ((ID)->fd) -extern ident_t * id_open __P((__STRUCT_IN_ADDR_P laddr, - __STRUCT_IN_ADDR_P faddr, - __STRUCT_TIMEVAL_P timeout)); +extern ident_t * id_open __P((struct in_addr * laddr, + struct in_addr * faddr, + struct timeval * timeout)); extern int id_close __P((ident_t *id)); extern int id_query __P((ident_t *id, int lport, int fport, - __STRUCT_TIMEVAL_P timeout)); + struct timeval * timeout)); extern int id_parse __P((ident_t *id, - __STRUCT_TIMEVAL_P timeout, + struct timeval * timeout, int *lport, int *fport, char **identifier, @@@@ -174,7 +160,7 @@@@ extern char *ident_id __P((int fd, int timeout)); -extern IDENT *ident_query __P(( __STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P raddr, int lport, int rport, int timeout)); +extern IDENT *ident_query __P(( struct in_addr * laddr, struct in_addr * raddr, int lport, int rport, int timeout)); extern void ident_free __P((IDENT *id)); @ 1.2 log @Add RCS Ids and convert to "diff -u" format. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Patches to adapt this package to NetBSD supplied by Greg A. Woods in PR pkg/7141. @ text @d1 96 a96 140 *** ident.h.orig Thu Nov 23 14:44:36 1995 --- ident.h Tue Jan 19 10:55:43 1999 *************** *** 13,22 **** #endif /* Sigh */ ! #ifdef __STDC__ ! # if __STDC__ == 1 ! # define IS_STDC 1 ! # endif #endif #ifdef __P --- 13,20 ---- #endif /* Sigh */ ! #if (0 - __STDC__) <= -1 ! # define IS_STDC 1 #endif #ifdef __P *************** *** 96,129 **** # include #endif #include #include - #include #if defined(VMS) && !defined(FD_SETSIZE) # define FD_SETSIZE 64 #endif - /* - * Sigh, GCC v2 complains when using undefined struct tags - * in function prototypes... - */ - #if defined(__GNUC__) && !defined(INADDR_ANY) - # define __STRUCT_IN_ADDR_P void * - #else - # define __STRUCT_IN_ADDR_P struct in_addr * - #endif - - #if defined(__GNUC__) && !defined(DST_NONE) - # define __STRUCT_TIMEVAL_P void * - #else - # define __STRUCT_TIMEVAL_P struct timeval * - #endif - - #if defined(__sgi) && defined(_POSIX_SOURCE) - # undef __STRUCT_TIMEVAL_P - # define __STRUCT_TIMEVAL_P void * - #endif - #ifndef IDBUFSIZE # define IDBUFSIZE 2048 #endif --- 94,115 ---- # include #endif #include + #if TIME_WITH_SYS_TIME + # include + # include + #else + # if HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif #include #if defined(VMS) && !defined(FD_SETSIZE) # define FD_SETSIZE 64 #endif #ifndef IDBUFSIZE # define IDBUFSIZE 2048 #endif *************** *** 149,167 **** /* Low-level calls and macros */ #define id_fileno(ID) ((ID)->fd) ! extern ident_t * id_open __P((__STRUCT_IN_ADDR_P laddr, ! __STRUCT_IN_ADDR_P faddr, ! __STRUCT_TIMEVAL_P timeout)); extern int id_close __P((ident_t *id)); extern int id_query __P((ident_t *id, int lport, int fport, ! __STRUCT_TIMEVAL_P timeout)); extern int id_parse __P((ident_t *id, ! __STRUCT_TIMEVAL_P timeout, int *lport, int *fport, char **identifier, --- 135,153 ---- /* Low-level calls and macros */ #define id_fileno(ID) ((ID)->fd) ! extern ident_t * id_open __P((struct in_addr * laddr, ! struct in_addr * faddr, ! struct timeval * timeout)); extern int id_close __P((ident_t *id)); extern int id_query __P((ident_t *id, int lport, int fport, ! struct timeval * timeout)); extern int id_parse __P((ident_t *id, ! struct timeval * timeout, int *lport, int *fport, char **identifier, *************** *** 174,180 **** extern char *ident_id __P((int fd, int timeout)); ! extern IDENT *ident_query __P(( __STRUCT_IN_ADDR_P laddr, __STRUCT_IN_ADDR_P raddr, int lport, int rport, int timeout)); extern void ident_free __P((IDENT *id)); --- 160,166 ---- extern char *ident_id __P((int fd, int timeout)); ! extern IDENT *ident_query __P(( struct in_addr * laddr, struct in_addr * raddr, int lport, int rport, int timeout)); extern void ident_free __P((IDENT *id)); @