Remove carriage returns.

diff --git a/src/mesa/shader/grammar/grammar_crt.c b/src/mesa/shader/grammar/grammar_crt.c
index 8db87358cc578c68fda0ca035c0c81541c3cbed8..bdf2da9b2e253ae532bff2be73e2f7fe430f27f9 100755 (executable)
--- a/src/mesa/shader/grammar/grammar_crt.c
+++ b/src/mesa/shader/grammar/grammar_crt.c
@@ -1,64 +1,64 @@
-#include "grammar_crt.h"\r
-\r
-#define GRAMMAR_PORT_BUILD 1\r
-#include "grammar.c"\r
-#undef GRAMMAR_PORT_BUILD\r
-\r
-\r
-void grammar_alloc_free (void *ptr)\r
-{\r
-    free (ptr);\r
-}\r
-\r
-void *grammar_alloc_malloc (unsigned int size)\r
-{\r
-    return malloc (size);\r
-}\r
-\r
-void *grammar_alloc_realloc (void *ptr, unsigned int old_size, unsigned int size)\r
-{\r
-    return realloc (ptr, size);\r
-}\r
-\r
-void *grammar_memory_copy (void *dst, const void * src, unsigned int size)\r
-{\r
-    return memcpy (dst, src, size);\r
-}\r
-\r
-int grammar_string_compare (const byte *str1, const byte *str2)\r
-{\r
-    return strcmp ((const char *) str1, (const char *) str2);\r
-}\r
-\r
-int grammar_string_compare_n (const byte *str1, const byte *str2, unsigned int n)\r
-{\r
-    return strncmp ((const char *) str1, (const char *) str2, n);\r
-}\r
-\r
-byte *grammar_string_copy (byte *dst, const byte *src)\r
-{\r
-    return (byte *) strcpy ((char *) dst, (const char *) src);\r
-}\r
-\r
-byte *grammar_string_copy_n (byte *dst, const byte *src, unsigned int n)\r
-{\r
-    return (byte *) strncpy ((char *) dst, (const char *) src, n);\r
-}\r
-\r
-unsigned int grammar_string_length (const byte *str)\r
-{\r
-    return strlen ((const char *) str);\r
-}\r
-\r
-byte *grammar_string_duplicate (const byte *src)\r
-{\r
-    const unsigned int size = grammar_string_length (src);\r
-    byte *str = grammar_alloc_malloc (size + 1);\r
-    if (str != NULL)\r
-    {\r
-        grammar_memory_copy (str, src, size);\r
-        str[size] = '\0';\r
-    }\r
-    return str;\r
-}\r
-\r
+#include "grammar_crt.h"
+
+#define GRAMMAR_PORT_BUILD 1
+#include "grammar.c"
+#undef GRAMMAR_PORT_BUILD
+
+
+void grammar_alloc_free (void *ptr)
+{
+    free (ptr);
+}
+
+void *grammar_alloc_malloc (unsigned int size)
+{
+    return malloc (size);
+}
+
+void *grammar_alloc_realloc (void *ptr, unsigned int old_size, unsigned int size)
+{
+    return realloc (ptr, size);
+}
+
+void *grammar_memory_copy (void *dst, const void * src, unsigned int size)
+{
+    return memcpy (dst, src, size);
+}
+
+int grammar_string_compare (const byte *str1, const byte *str2)
+{
+    return strcmp ((const char *) str1, (const char *) str2);
+}
+
+int grammar_string_compare_n (const byte *str1, const byte *str2, unsigned int n)
+{
+    return strncmp ((const char *) str1, (const char *) str2, n);
+}
+
+byte *grammar_string_copy (byte *dst, const byte *src)
+{
+    return (byte *) strcpy ((char *) dst, (const char *) src);
+}
+
+byte *grammar_string_copy_n (byte *dst, const byte *src, unsigned int n)
+{
+    return (byte *) strncpy ((char *) dst, (const char *) src, n);
+}
+
+unsigned int grammar_string_length (const byte *str)
+{
+    return strlen ((const char *) str);
+}
+
+byte *grammar_string_duplicate (const byte *src)
+{
+    const unsigned int size = grammar_string_length (src);
+    byte *str = grammar_alloc_malloc (size + 1);
+    if (str != NULL)
+    {
+        grammar_memory_copy (str, src, size);
+        str[size] = '\0';
+    }
+    return str;
+}
+

diff --git a/src/mesa/shader/grammar/grammar_crt.h b/src/mesa/shader/grammar/grammar_crt.h
index f0827ce96f7462261fc113101680fb3f6d2074ae..492711e96aeae52c3447ab0ccd64bf16c726d2d6 100755 (executable)
--- a/src/mesa/shader/grammar/grammar_crt.h
+++ b/src/mesa/shader/grammar/grammar_crt.h
@@ -1,20 +1,20 @@
-#ifndef GRAMMAR_CRT_H\r
-#define GRAMMAR_CRT_H\r
-\r
-\r
-#include <stdlib.h>\r
-#include <malloc.h>\r
-#include <string.h>\r
-\r
-\r
-typedef unsigned long grammar;\r
-typedef unsigned char byte;\r
-\r
-\r
-#define GRAMMAR_PORT_INCLUDE 1\r
-#include "grammar.h"\r
-#undef GRAMMAR_PORT_INCLUDE\r
-\r
-\r
-#endif\r
-\r
+#ifndef GRAMMAR_CRT_H
+#define GRAMMAR_CRT_H
+
+
+#include <stdlib.h>
+#include <malloc.h>
+#include <string.h>
+
+
+typedef unsigned long grammar;
+typedef unsigned char byte;
+
+
+#define GRAMMAR_PORT_INCLUDE 1
+#include "grammar.h"
+#undef GRAMMAR_PORT_INCLUDE
+
+
+#endif
+