summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-08-03 10:57:15 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-08-03 10:57:15 +1000
commit212cfc4b4869fbbe5b038f7480e67d26f60f1545 (patch)
tree3cd2a36fffb7398049260f83647ae751a17f9289
parent7da23cb5d307a98bb7a58445a845fab7abc35024 (diff)
- (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines
individually and use a value less likely to collide with real values from netdb.h. Fixes compile warnings on FreeBSD 5.3. ok djm@
-rw-r--r--ChangeLog7
-rw-r--r--openbsd-compat/fake-rfc2553.h16
2 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b45ebb49..04fa21d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20050803
+ - (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines
+ individually and use a value less likely to collide with real values from
+ netdb.h. Fixes compile warnings on FreeBSD 5.3. ok djm@
+
20050802
- (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2005/07/27 10:39:03
@@ -2889,4 +2894,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3860 2005/08/02 14:20:15 dtucker Exp $
+$Id: ChangeLog,v 1.3861 2005/08/03 00:57:15 dtucker Exp $
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index 636792ed..24a34d17 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,4 @@
-/* $Id: fake-rfc2553.h,v 1.10 2005/02/11 07:32:13 dtucker Exp $ */
+/* $Id: fake-rfc2553.h,v 1.11 2005/08/03 00:57:15 dtucker Exp $ */
/*
* Copyright (C) 2000-2003 Damien Miller. All rights reserved.
@@ -114,10 +114,16 @@ struct sockaddr_in6 {
#endif /* !NI_MAXHOST */
#ifndef EAI_NODATA
-# define EAI_NODATA 1
-# define EAI_MEMORY 2
-# define EAI_NONAME 3
-# define EAI_SYSTEM 4
+# define EAI_NODATA (MAX_INT - 1)
+#endif
+#ifndef EAI_MEMORY
+# define EAI_MEMORY (MAX_INT - 2)
+#endif
+#ifndef EAI_NONAME
+# define EAI_NONAME (MAX_INT - 3)
+#endif
+#ifndef EAI_SYSTEM
+# define EAI_SYSTEM (MAX_INT - 4)
#endif
#ifndef HAVE_STRUCT_ADDRINFO