Fix a few cases of mixed line-endings

This is a scripted conversion of mixed line-ending files to LF-only or CRLF-only
based on which patch is smaller.  I used a threshold of upto a quarter of the
lines to determine whether to keep the patch or not.

diff --git a/.gitattributes b/.gitattributes
index 6e3af18e15514fc1f2d6f31415954a7087de0705..5b8c9301a732c451447e2a5c17f34e30caa858da 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
 /BCC_MAKEFILE -crlf
 /digimars.mak -crlf
-/win32_threads.c -crlf

diff --git a/include/private/.gitattributes b/include/private/.gitattributes
deleted file mode 100644 (file)
index 998a67d..0000000
--- a/include/private/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-/gcconfig.h -crlf

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 10ffed637556ea6f90622b0e06e26b33eca7105f..e517d70fc3f9b53a8ee8dcc79d08b6949b202cef 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -408,18 +408,18 @@
 # else
 #   if (defined(_MSDOS) || defined(_MSC_VER)) && (_M_IX86 >= 300) \
         || defined(_WIN32) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
-#     if defined(__LP64__) || defined(_WIN64)\r
-#      define X86_64\r
-#     else\r
-#       define I386\r
-#     endif\r
-#     define MSWIN32   /* or Win64 */\r
-#     define mach_type_known\r
-#   endif\r
-#   if defined(_MSC_VER) && defined(_M_IA64)\r
-#     define IA64\r
-#     define MSWIN32   /* Really win64, but we don't treat 64-bit      */\r
-                       /* variants as a differnt platform.             */\r
+#     if defined(__LP64__) || defined(_WIN64)
+#      define X86_64
+#     else
+#       define I386
+#     endif
+#     define MSWIN32   /* or Win64 */
+#     define mach_type_known
+#   endif
+#   if defined(_MSC_VER) && defined(_M_IA64)
+#     define IA64
+#     define MSWIN32   /* Really win64, but we don't treat 64-bit      */
+                       /* variants as a differnt platform.             */
 #   endif
 # endif
 # if defined(__DJGPP__)
@@ -808,7 +808,7 @@
 #     define STACKBOTTOM ((ptr_t) LMGetCurStackBase())
 #     define DATAEND  /* not needed */
 #   endif
-\r
+
 #   ifdef LINUX
 #     if defined(__powerpc64__)
 #       define ALIGNMENT 8

diff --git a/win32_threads.c b/win32_threads.c
index a2cd0fda43ee3dbd88bf8d15884bc76c1f35c750..9662eb186ceb1f5f69184d47070e08670f309a72 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -385,10 +385,10 @@ void GC_push_all_stacks()
 #       define PUSH4(r1,r2,r3,r4) PUSH2(r1,r2), PUSH2(r3,r4)
 #       if defined(I386)
           PUSH4(Edi,Esi,Ebx,Edx), PUSH2(Ecx,Eax), PUSH1(Ebp);
-         sp = (ptr_t)context.Esp;\r
-#      elif defined(X86_64)\r
-         PUSH4(Rax,Rcx,Rdx,Rbx); PUSH2(Rbp, Rsi); PUSH1(Rdi);\r
-         PUSH4(R8, R9, R10, R11); PUSH4(R12, R13, R14, R15);\r
+         sp = (ptr_t)context.Esp;
+#      elif defined(X86_64)
+         PUSH4(Rax,Rcx,Rdx,Rbx); PUSH2(Rbp, Rsi); PUSH1(Rdi);
+         PUSH4(R8, R9, R10, R11); PUSH4(R12, R13, R14, R15);
          sp = (ptr_t)context.Rsp;
 #       elif defined(ARM32)
          PUSH4(R0,R1,R2,R3),PUSH4(R4,R5,R6,R7),PUSH4(R8,R9,R10,R11),PUSH1(R12);