rpms/dhcp/devel dhcp-3.0.3rc1-no-__u16.patch,NONE,1.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jul 14 16:53:25 UTC 2005


Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30139

Added Files:
	dhcp-3.0.3rc1-no-__u16.patch 
Log Message:
fix compilation with glibc-headers-2.3.5-11+: __u16 -> u_int16_t in tr.c

dhcp-3.0.3rc1-no-__u16.patch:
 tr.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dhcp-3.0.3rc1-no-__u16.patch ---
--- dhcp-3.0.3rc1/common/tr.c.no-__u16	2004-06-10 13:59:21.000000000 -0400
+++ dhcp-3.0.3rc1/common/tr.c	2005-07-14 12:41:51.000000000 -0400
@@ -59,8 +59,8 @@
         struct routing_entry *next;
         unsigned char addr[TR_ALEN];
         unsigned char iface[5];
-        __u16 rcf;                      /* route control field */
-        __u16 rseg[8];                  /* routing registers */
+        u_int16_t rcf;                      /* route control field */
+        u_int16_t rseg[8];                  /* routing registers */
         unsigned long access_time;      /* time we last used this entry */
 };
 
@@ -217,7 +217,7 @@
 		if (rover != NULL) {
                         /* success: route that frame */
                         if ((rover->rcf & TR_RCF_LEN_MASK) >> 8) {
-                                __u16 rcf = rover->rcf;
+                                u_int16_t rcf = rover->rcf;
 				memcpy(trh->rseg,rover->rseg,sizeof(trh->rseg));
 				rcf ^= TR_RCF_DIR_BIT;	
 				rcf &= ~TR_RCF_BROADCAST_MASK;
@@ -254,7 +254,7 @@
         struct routing_entry *rover;
         struct timeval now;
         unsigned char saddr[TR_ALEN];
-        __u16 rcf = 0;
+        u_int16_t rcf = 0;
 
         gettimeofday(&now, NULL);
 




More information about the fedora-cvs-commits mailing list