[Javanetsim-cvs] IceScan/icesockets sock_types.h,1.12,1.13

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/IceScan/icesockets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13285/icesockets

Modified Files:
	sock_types.h 
Log Message:
no message

Index: sock_types.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_types.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** sock_types.h	16 Dec 2006 11:39:17 -0000	1.12
--- sock_types.h	16 Dec 2006 12:18:05 -0000	1.13
***************
*** 32,38 ****
  #include <netinet/ip.h>
  #include <netinet/ip_icmp.h>
- #include <netinet/udp.h>
  #define __FAVOR_BSD	
  #include <netinet/tcp.h>
  
  #define my_uint16_t uint16_t
--- 32,43 ----
  #include <netinet/ip.h>
  #include <netinet/ip_icmp.h>
  #define __FAVOR_BSD	
  #include <netinet/tcp.h>
+ #undef __FAVOR_BSD	
+ 
+ #ifndef __CYGWIN__
+     #undef __FAVOR_BSD	
+     #include <netinet/udp.h>
+ #endif
  
  #define my_uint16_t uint16_t
***************
*** 238,249 ****
  	char arp_dev[16];
      };
!     
      /* UDP header as specified by RFC 768, August 1980. */
! //    struct udphdr {
! //	    u_short	uh_sport;		/* source port */
! //	    u_short	uh_dport;		/* destination port */
! //	    u_short	uh_ulen;		/* udp length */
! //	    u_short	uh_sum;			/* udp checksum */
! //    };
      #define SIOCGARP        0x8954          /* get ARP table entry          */
      #define SOL_UDP            17
--- 243,257 ----
  	char arp_dev[16];
      };
! 
      /* UDP header as specified by RFC 768, August 1980. */
! 
!     struct udphdr
!     {
!       u_int16_t source;
!       u_int16_t dest;
!       u_int16_t len;
!       u_int16_t check;
!     };
!     
      #define SIOCGARP        0x8954          /* get ARP table entry          */
      #define SOL_UDP            17