[GNUnet-SVN] r12683 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2010-08-20 14:45:08 +0200 (Fri, 20 Aug 2010)
New Revision: 12683

Modified:
   gnunet/src/transport/gnunet-nat-server-windows.c
Log:
code cleanup

Modified: gnunet/src/transport/gnunet-nat-server-windows.c
===================================================================
--- gnunet/src/transport/gnunet-nat-server-windows.c    2010-08-20 12:44:16 UTC 
(rev 12682)
+++ gnunet/src/transport/gnunet-nat-server-windows.c    2010-08-20 12:45:08 UTC 
(rev 12683)
@@ -59,12 +59,10 @@
  */
 #define VERBOSE 0
 
-
-typedef unsigned int uid_t;
-typedef SOCKET Socket;
-typedef unsigned short ushort;
 #define IPDEFTTL 64
+
 #define ICMP_ECHO 8
+
 #define ICMP_TIME_EXCEEDED      11      /* Time Exceeded
 
 /**
@@ -157,9 +155,9 @@
   uint32_t length;
 };
 
-static Socket icmpsock;
+static SOCKET icmpsock;
 
-static Socket rawsock;
+static SOCKET rawsock;
 
 static struct in_addr dummy;
 
@@ -378,10 +376,10 @@
 }
 
 
-static Socket
+static SOCKET
 make_icmp_socket ()
 {
-  Socket ret;
+  SOCKET ret;
 
   ret = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP);
   if (INVALID_SOCKET == ret)
@@ -395,7 +393,7 @@
 }
 
 
-static Socket
+static SOCKET
 make_raw_socket ()
 {
   DWORD bOptVal = TRUE;