Changeset 756


Ignore:
Timestamp:
04/27/06 22:13:18 (7 years ago)
Author:
mglb1
Message:

WIN32 portability fixes for the test code

Location:
trunk/test
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/test-convert.c

    r723 r756  
    2828 * 
    2929 */ 
    30  
     30#ifndef WIN32 
     31#  include <sys/time.h> 
     32#  include <netinet/in.h> 
     33#  include <netinet/in_systm.h> 
     34#  include <netinet/tcp.h> 
     35#  include <netinet/ip.h> 
     36#  include <netinet/ip_icmp.h> 
     37#  include <arpa/inet.h> 
     38#  include <sys/socket.h> 
     39#endif 
    3140 
    3241#include <stdio.h> 
    … …  
    3443#include <assert.h> 
    3544#include <string.h> 
    36 #include <sys/time.h> 
    3745#include <sys/types.h> 
    3846#include <time.h> 
     47#include <string.h> 
    3948 
    40 #include <netinet/in.h> 
    41 #include <netinet/in_systm.h> 
    42 #include <netinet/tcp.h> 
    43 #include <netinet/ip.h> 
    44 #include <netinet/ip_icmp.h> 
    45 #include <arpa/inet.h> 
    46 #include <sys/socket.h> 
    47 #include <string.h> 
    4849#include "dagformat.h" 
    4950#include "libtrace.h" 

  • trunk/test/test-format.c

    r723 r756  
    2828 * 
    2929 */ 
    30  
    31  
     30#ifndef WIN32 
     31#  include <sys/time.h> 
     32#  include <netinet/in.h> 
     33#  include <netinet/in_systm.h> 
     34#  include <netinet/tcp.h> 
     35#  include <netinet/ip.h> 
     36#  include <netinet/ip_icmp.h> 
     37#  include <arpa/inet.h> 
     38#  include <sys/socket.h> 
     39#endif 
    3240#include <stdio.h> 
    3341#include <stdlib.h> 
    3442#include <assert.h> 
    3543#include <string.h> 
    36 #include <sys/time.h> 
    3744#include <sys/types.h> 
    3845#include <time.h> 
     46#include <string.h> 
    3947 
    40 #include <netinet/in.h> 
    41 #include <netinet/in_systm.h> 
    42 #include <netinet/tcp.h> 
    43 #include <netinet/ip.h> 
    44 #include <netinet/ip_icmp.h> 
    45 #include <arpa/inet.h> 
    46 #include <sys/socket.h> 
    47 #include <string.h> 
    4848#include "dagformat.h" 
    4949#include "libtrace.h" 
    … …  
    7575 
    7676int main(int argc, char *argv[]) { 
    77         int psize = 0; 
     77        int psize = 0; 
    7878        int error = 0; 
    7979        int count = 0; 
    … …  
    9999         
    100100        packet=trace_create_packet(); 
    101         for (;;) { 
     101        for (;;) { 
    102102                if ((psize = trace_read_packet(trace, packet)) <0) { 
    103103                        error = 1; 

  • trunk/test/test-pcap-bpf.c

    r752 r756  
    2828 * 
    2929 */ 
    30  
     30#ifndef WIN32 
     31#  include <sys/time.h> 
     32#  include <netinet/in.h> 
     33#  include <netinet/in_systm.h> 
     34#  include <netinet/tcp.h> 
     35#  include <netinet/ip.h> 
     36#  include <netinet/ip_icmp.h> 
     37#  include <arpa/inet.h> 
     38#  include <sys/socket.h> 
     39#endif 
    3140 
    3241#include <stdio.h> 
    … …  
    3443#include <assert.h> 
    3544#include <string.h> 
    36 #include <sys/time.h> 
    3745#include <sys/types.h> 
    3846#include <time.h> 
     47#include <string.h> 
    3948 
    40 #include <netinet/in.h> 
    41 #include <netinet/in_systm.h> 
    42 #include <netinet/tcp.h> 
    43 #include <netinet/ip.h> 
    44 #include <netinet/ip_icmp.h> 
    45 #include <arpa/inet.h> 
    46 #include <sys/socket.h> 
    47 #include <string.h> 
    4849#include "dagformat.h" 
    4950#include "libtrace.h" 
Note: See TracChangeset for help on using the changeset viewer.