* give an error stating that you have to use the latest released compiler

    to build 2.3.1 since the unicode branch merge

git-svn-id: trunk@11795 -

compiler/options.pas

@@ -2196,6 +2196,7 @@ begin
 {$if defined(x86) or defined(powerpc) or defined(powerpc64)}
   def_system_macro('FPC_HAS_INTERNAL_ABS_LONG');
 {$endif}
+  def_system_macro('FPC_HAS_UNICODESTRING');
 
 { these cpus have an inline rol/ror implementaion }
 {$if defined(x86) or defined(arm) or defined(powerpc) or defined(powerpc64)}

rtl/inc/systemh.inc

@@ -79,6 +79,12 @@
 {$define FPC_HAS_FEATURE_DYNLIBS}
 {$endif FPC_HAS_FEATURE_SUPPORT}
 
+{$ifndef VER2_2}
+{$ifndef FPC_HAS_UNICODESTRING}
+{$error Building trunk is only supported when using the latest release as a starting compiler}
+{$endif}
+{$endif}
+
 {****************************************************************************
                          Global Types and Constants
 ****************************************************************************}