cppbind: automatic conversion of SGReferenced derived pointers.

[simgear.git] / simgear / misc / sgstream.cxx

diff --git a/simgear/misc/sgstream.cxx b/simgear/misc/sgstream.cxx
index 70da33afd1316052ebc9925a699a9fb4946392f6..c2ed93b5869e8bfe43708d9f0f07409220062f11 100644 (file)
--- a/simgear/misc/sgstream.cxx
+++ b/simgear/misc/sgstream.cxx
@@ -102,14 +102,17 @@ istream&
 skipeol( istream& in )
 {
     char c = '\0';
-    // skip to end of line.
 
+    // make sure we detect LF, CR and CR/LF
     while ( in.get(c) ) {
-       if ( (c == '\n') || (c == '\r') ) {
-           break;
-       }       
+        if (c == '\n')
+            break;
+        else if (c == '\r') {
+            if (in.peek() == '\n')
+                in.get(c);
+            break;
+        }
     }
-
     return in;
 }