[Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.c, 1.64, 1.65 olsrd_plugin.c, 1.15, 1.16

Bernd Petrovitsch (spam-protected)
Wed May 9 02:22:49 CEST 2007


Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15382/lib/httpinfo/src

Modified Files:
	olsrd_httpinfo.c olsrd_plugin.c 
Log Message:
* compiles now on win32

Index: olsrd_httpinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** olsrd_httpinfo.c	28 Apr 2007 20:51:05 -0000	1.64
--- olsrd_httpinfo.c	9 May 2007 00:22:47 -0000	1.65
***************
*** 50,54 ****
--- 50,56 ----
  #include <unistd.h>
  #include <errno.h>
+ #ifndef WIN32
  #include <netdb.h>
+ #endif
  
  #include "olsr.h"
***************
*** 727,731 ****
    char maskbuf[32];
    char *maskstr;
!   const struct hostent * const hp = resolve_ip_addresses ? gethostbyaddr(ipaddr, olsr_cnf->ipsize, olsr_cnf->ip_version) : NULL;
    if (mask != NULL) {
      if (olsr_cnf->ip_version == AF_INET) {
--- 729,738 ----
    char maskbuf[32];
    char *maskstr;
!   const struct hostent * const hp =
! #ifndef WIN32
!                                     resolve_ip_addresses ? gethostbyaddr(ipaddr, olsr_cnf->ipsize, olsr_cnf->ip_version) :
! #else
!                                         NULL;
! #endif
    if (mask != NULL) {
      if (olsr_cnf->ip_version == AF_INET) {

Index: olsrd_plugin.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_plugin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** olsrd_plugin.c	20 Apr 2007 14:06:18 -0000	1.15
--- olsrd_plugin.c	9 May 2007 00:22:47 -0000	1.16
***************
*** 51,55 ****
--- 51,57 ----
  #include <stdlib.h>
  #include <netinet/in.h>
+ #ifndef WIN32
  #include <arpa/nameser.h>
+ #endif
  
  #include "olsrd_httpinfo.h"





More information about the Olsr-cvs mailing list