philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define BIND_4_COMPAT everywhere (except OS X, who just _had_ to be different)

Browse Source 
and switch to using BIND4 macros (GETSHORT / GETLONG).

Should fix /nslookup on OpenBSD.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@196 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-05-27 04:42:09 +00:00
parent 82f7a2ccf2
commit 79625bf516
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@@ -126,11 +126,14 @@ for reslib in '' '-lresolv' '-lbind' '-lsocket'
do do
LIBS="$reslib $OLDLIBS" LIBS="$reslib $OLDLIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([ AC_LINK_IFELSE([AC_LANG_SOURCE([
#if defined( __APPLE__ ) && !defined( BIND_8_COMPAT ) #if !defined( __APPLE__ )
#if !defined( BIND_4_COMPAT )
#define BIND_4_COMPAT
#endif
#else
#if !defined( BIND_8_COMPAT )
#define BIND_8_COMPAT #define BIND_8_COMPAT
#endif #endif
#if defined( __OpenBSD__ ) && !defined( BIND_4_COMPAT )
#define BIND_4_COMPAT
#endif #endif
AC_INCLUDES_DEFAULT AC_INCLUDES_DEFAULT
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H

25
source/misc.c
View File

@@ -1991,15 +1991,18 @@ void ar_rename_nick(char *old_nick, char *new_nick, int server)
* heavily modified for use in a irc client. * heavily modified for use in a irc client.
*/ */
/* In OS X 10.3 onward, we have to define BIND_8_COMPAT to get #if !defined( __APPLE__ )
/* On some systems, eg OpenBSD, we have to define BIND_4_COMPAT to get
* nameser_compat.h included, to get the "old" bind interface. */ * nameser_compat.h included, to get the "old" bind interface. */
#if defined( __APPLE__ ) && !defined( BIND_8_COMPAT ) #if !defined( BIND_4_COMPAT )
#define BIND_8_COMPAT
#endif
/* In OpenBSD, we have to define BIND_4_COMPAT to get
* nameser_compat.h included, to get the "old" bind interface. */
#if defined( __OpenBSD__ ) && !defined( BIND_4_COMPAT )
#define BIND_4_COMPAT #define BIND_4_COMPAT
#endif
#else
/* After one too many bongs some developer at Apple decided to rename this
* macro for no good reason. */
#if !defined( BIND_8_COMPAT )
#define BIND_8_COMPAT
#endif
#endif #endif
#include <stdio.h> #include <stdio.h>
@@ -2660,10 +2663,10 @@ static int ar_procanswer(struct reslist *rptr, HEADER *hptr, char *buf, char *eo
* the pointer to the right spot. Some of thse are actually * the pointer to the right spot. Some of thse are actually
* useful so its not a good idea to skip past in one big jump. * useful so its not a good idea to skip past in one big jump.
*/ */
NS_GET16(type, cp); GETSHORT(type, cp);
NS_GET16(class, cp); GETSHORT(class, cp);
NS_GET32(ttl, cp); GETLONG(ttl, cp);
NS_GET16(dlen, cp); GETSHORT(dlen, cp);
rptr->re_type = type; rptr->re_type = type;
switch(type) switch(type)