Merge pull request hgourvest#1 from Xepol/verfix

Improved Delpi version handling

.gitignore

@@ -1,2 +1,18 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+__history
+__recovery
+*.dsk
+*.identcache
+*.local
+*.stat
+*.tvsconfig
+*.~*
 *.dcu
-__history
+*.dcp
+*.bpl
+*.bak*

superobject.pas

@@ -94,13 +94,13 @@
   {$define VER230ORGREATER}
 {$ifend}
 
-{$if defined(FPC) or defined(VER170) or defined(VER180) or defined(VER190)
+{$if defined(FPC) or defined(VER170) or defined(VER180) or defined(VER190)
   or defined(VER200) or defined(VER210ORGREATER)}
   {$DEFINE HAVE_INLINE}
 {$ifend}
 
 {$if defined(VER210ORGREATER)}
-  {$define HAVE_RTTI}
+  {$define HAVE_RTTI}
 {$ifend}
 
 {$if defined(VER230ORGREATER)}
@@ -111,6 +111,19 @@
   {$define NEED_FORMATSETTINGS}
 {$ifend}
 
+{$IFDEF CONDITIONALEXPRESSIONS}
+    {$IF CompilerVersion >= 17.0}
+      {$DEFINE HAVE_INLINE}
+    {$ENDIF}
+    {$IF CompilerVersion >= 21.0}
+      {$DEFINE HAVE_RTTI}
+    {$ENDIF}
+    {$IF CompilerVersion >= 23.0}
+      {$DEFINE NEED_FORMATSETTINGS}
+    {$ENDIF}
+{$ENDIF}
+
+
 {$OVERFLOWCHECKS OFF}
 {$RANGECHECKS OFF}