From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Tue, 27 Jan 2009 19:22:42 +0000 (+0000)
Subject: Fixed some issues with C++ style comments that leaked into the code.
X-Git-Tag: v2.1_rc16~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=435f512a1f565f92e7297edc102d8f782565f7a5;p=thirdparty%2Fopenvpn.git

Fixed some issues with C++ style comments that leaked into the code.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3899 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/proto.h b/proto.h
index c33fd9200..443d4575d 100644
--- a/proto.h
+++ b/proto.h
@@ -66,15 +66,15 @@ struct openvpn_ethhdr
 
 struct openvpn_arp {
 # define ARP_MAC_ADDR_TYPE 0x0001
-  uint16_t mac_addr_type;       // 0x0001
+  uint16_t mac_addr_type;       /* 0x0001 */
 
-  uint16_t proto_addr_type;     // 0x0800
-  uint8_t  mac_addr_size;       // 0x06
-  uint8_t  proto_addr_size;     // 0x04
+  uint16_t proto_addr_type;     /* 0x0800 */
+  uint8_t  mac_addr_size;       /* 0x06 */
+  uint8_t  proto_addr_size;     /* 0x04 */
 
 # define ARP_REQUEST 0x0001
 # define ARP_REPLY   0x0002
-  uint16_t arp_command;         // 0x0001 for ARP request, 0x0002 for ARP reply
+  uint16_t arp_command;         /* 0x0001 for ARP request, 0x0002 for ARP reply */
 
   uint8_t   mac_src[OPENVPN_ETH_ALEN];
   in_addr_t ip_src;
diff --git a/route.c b/route.c
index 1efcf4e7d..d31b023cb 100644
--- a/route.c
+++ b/route.c
@@ -1530,7 +1530,7 @@ get_default_gateway (in_addr_t *gateway, in_addr_t *netmask)
 	  *gateway = best_gw;
 	  if (netmask)
 	    {
-	      *netmask = 0xFFFFFF00; // FIXME -- get the real netmask of the adapter containing the default gateway
+	      *netmask = 0xFFFFFF00; /* FIXME -- get the real netmask of the adapter containing the default gateway */
 	    }
 	  ret = true;
 	}