From ec4562cdc52854af31e7c433f926a947d6935a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 31 May 1998 16:08:28 +0200
Subject: [PATCH] Now checks HAVE_IN_ADDR_T.
Rev: src/modules/system/system.c:1.54
---
src/modules/system/system.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index c87db71eba..34f123b6dc 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1,5 +1,5 @@
/*
- * $Id: system.c,v 1.53 1998/05/29 19:24:20 marcus Exp $
+ * $Id: system.c,v 1.54 1998/05/31 14:08:28 grubba Exp $
*
* System-call module for Pike
*
@@ -14,7 +14,7 @@
#include "system.h"
#include "global.h"
-RCSID("$Id: system.c,v 1.53 1998/05/29 19:24:20 marcus Exp $");
+RCSID("$Id: system.c,v 1.54 1998/05/31 14:08:28 grubba Exp $");
#ifdef HAVE_WINSOCK_H
#include <winsock.h>
#endif
@@ -81,6 +81,12 @@ RCSID("$Id: system.c,v 1.53 1998/05/29 19:24:20 marcus Exp $");
#endif /* NGROUPS */
#endif /* !NGROUPS_MAX */
+#ifdef HAVE_IN_ADDR_T
+#define IN_ADDR_T in_addr_t
+#else /* !HAVE_IN_ADDR_T */
+#define IN_ADDR_T unsigned int
+#endif /* HAVE_IN_ADDR_T */
+
/*
* Functions
*/
@@ -750,7 +756,7 @@ void get_inet_addr(struct sockaddr_in *addr,char *name)
}
else if(my_isipnr(name)) /* I do not entirely trust inet_addr */
{
- if (inet_addr(name) == (in_addr_t)-1)
+ if (((IN_ADDR_T)inet_addr(name)) == ((IN_ADDR_T)-1))
error("Malformed ip number.\n");
addr->sin_addr.s_addr = inet_addr(name);
--
GitLab