backing out windows style CR/LF
authorHannes Gredler <hannes@gredler.at>
Thu, 12 Jun 2008 07:10:13 +0000 (09:10 +0200)
committerHannes Gredler <hannes@gredler.at>
Thu, 12 Jun 2008 07:10:13 +0000 (09:10 +0200)
src/tc_set.c

index d914515..50bafae 100644 (file)
@@ -750,23 +750,23 @@ olsr_calculate_tc_border(olsr_u8_t lower_border,
 
     lower_border--;
     for (i = 0; i < lower_border / 8; i++) {
 
     lower_border--;
     for (i = 0; i < lower_border / 8; i++) {
-#ifdef WIN32\r
-               lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - i - 1] = 0;\r
-#else\r
+#ifdef WIN32
+               lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - i - 1] = 0;
+#else
                lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;
                lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;
-#endif\r
+#endif
     }
     }
-#ifdef WIN32\r
-    lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - lower_border / 8 -\r
-                                      1] &= (0xff << (lower_border & 7));\r
-    lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - lower_border / 8 -\r
-                                      1] |= (1 << (lower_border & 7));\r
-#else\r
+#ifdef WIN32
+    lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - lower_border / 8 -
+                                      1] &= (0xff << (lower_border & 7));
+    lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - lower_border / 8 -
+                                      1] |= (1 << (lower_border & 7));
+#else
     lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - lower_border / 8 -
                                       1] &= (0xff << (lower_border & 7));
     lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - lower_border / 8 -
                                       1] |= (1 << (lower_border & 7));
     lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - lower_border / 8 -
                                       1] &= (0xff << (lower_border & 7));
     lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - lower_border / 8 -
                                       1] |= (1 << (lower_border & 7));
-#endif\r
+#endif
   }
 
   if (upper_border == 0xff) {
   }
 
   if (upper_border == 0xff) {
@@ -777,22 +777,22 @@ olsr_calculate_tc_border(olsr_u8_t lower_border,
     upper_border--;
 
     for (i = 0; i < upper_border / 8; i++) {
     upper_border--;
 
     for (i = 0; i < upper_border / 8; i++) {
-#ifdef WIN32\r
-               upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - i - 1] = 0;\r
-#else\r
-               upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;\r
+#ifdef WIN32
+               upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - i - 1] = 0;
+#else
+               upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;
 #endif
     }
 #endif
     }
-#ifdef WIN32\r
-    upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - upper_border / 8 -\r
-                                      1] &= (0xff << (upper_border & 7));\r
-    upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - upper_border / 8 -\r
-                                      1] |= (1 << (upper_border & 7));\r
-#else\r
+#ifdef WIN32
+    upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - upper_border / 8 -
+                                      1] &= (0xff << (upper_border & 7));
+    upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - upper_border / 8 -
+                                      1] |= (1 << (upper_border & 7));
+#else
     upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - upper_border / 8 -
                                       1] &= (0xff << (upper_border & 7));
     upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - upper_border / 8 -
     upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - upper_border / 8 -
                                       1] &= (0xff << (upper_border & 7));
     upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - upper_border / 8 -
-                                      1] |= (1 << (upper_border & 7));\r
+                                      1] |= (1 << (upper_border & 7));
 #endif
   }
   return 1;
 #endif
   }
   return 1;