--- defines-orig.awk	Thu Sep  2 15:52:10 2010
+++ defines.awk	Thu Sep  2 15:56:01 2010
@@ -51,8 +51,9 @@
   for (key in D) D_is_set[key] = 1
   FS = " "
 }
-/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|$)/ {
+/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|\r$)/ {
   line = $ 0
+  sub(/\r$/, "", line)
   split(line, arg, " ")
   if (arg[1] == "#") {
     defundef = arg[2]
