line endings related fixes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..f8a9c28
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# make git not do text conversions (preserve line endings as-is)
+* -text

diff --git a/lcorelocalips.pas b/lcorelocalips.pas
index 8698a8cc47b305d59b9518d90be4110ebb6b155f..edd306ce4cd8ad836c615286d659a79b5fc8b5a8 100644 (file)
--- a/lcorelocalips.pas
+++ b/lcorelocalips.pas
@@ -418,4 +418,5 @@ begin
 end;\r
 {$endif}\r
 \r
 end;\r
 {$endif}\r
 \r

-end.\r
\ No newline at end of file
+end.\r
+\r

diff --git a/pgtypes.inc b/pgtypes.inc
index 6676698192b44febdf8c976a8fa8c1602f2e86ee..378eab27e67f3dad600780c265838c18ef5a1f89 100644 (file)
--- a/pgtypes.inc
+++ b/pgtypes.inc
@@ -1,20 +1,20 @@
-{$ifdef cpu386}
-  {$define i386}
-  {$define cpux86}
-{$endif}
-
-{$ifdef cpuamd64}
-  {$define cpux64}
-{$endif}
- 
-
-{$ifdef i386}
-{$define ENDIAN_LITTLE}
-{$ifdef fpc}{$asmmode intel}{$endif}
-{$endif}
-
-{$ifdef cpux64}
-{$define ENDIAN_LITTLE}
-{$ifdef fpc}{$asmmode intel}{$endif}
-{$endif}
-
+{$ifdef cpu386}\r
+  {$define i386}\r
+  {$define cpux86}\r
+{$endif}\r
+\r
+{$ifdef cpuamd64}\r
+  {$define cpux64}\r
+{$endif}\r
+ \r
+\r
+{$ifdef i386}\r
+{$define ENDIAN_LITTLE}\r
+{$ifdef fpc}{$asmmode intel}{$endif}\r
+{$endif}\r
+\r
+{$ifdef cpux64}\r
+{$define ENDIAN_LITTLE}\r
+{$ifdef fpc}{$asmmode intel}{$endif}\r
+{$endif}\r
+\r