to resolve conflict.
--- Merging r46471 into '.':
C rtl/symbian/Makefile
U rtl/symbian/Makefile.fpc
--- Recording mergeinfo for merge of r46471 into '.':
U .
Summary of conflicts:
Text conflicts: 1
git-svn-id: branches/fixes_3_2@46873 -
r42555 | pierre | 2019-08-02 11:21:43 +0000 (Fri, 02 Aug 2019) | 1 line
Add .NOTPARALLEL for beos and haiku RTLs
------------------------------------------------------------------------
--- Merging r42555 into '.':
U rtl/beos/Makefile
U rtl/beos/Makefile.fpc
U rtl/haiku/Makefile
U rtl/haiku/Makefile.fpc
--- Recording mergeinfo for merge of r42555 into '.':
U .
------------------------------------------------------------------------
r43042 | pierre | 2019-09-19 20:49:12 +0000 (Thu, 19 Sep 2019) | 3 lines
+ Add math unit dependency to types$(PPUEXT) rule.
* Fix missing close-brace in several types$(PPUEXT) rules.
------------------------------------------------------------------------
--- Merging r43042 into '.':
U rtl/<all target OS directories>/Makefile
U rtl/<all target OS directories>/Makefile.fpc
git-svn-id: branches/fixes_3_2@43184 -
unicodestring = java.lang.String. The reason this was the default in
the past is that this was the first string type that was implemented,
and without it being the default most code involving string operations
would fail. Now the default strings types are the same as for other
targets
+ new {$modeswitch unicodestrings} directive, that when activated
*together* with {$h+},
1) changes char into an alias for widechar
2) changes string into an alias for unicodestring
3) changes the preferred string evaluation type (in case of uncertainty)
to unicodestring
{$modeswitch unicodestrings} with {$h-} does not change anything at all
regarding the string type (it still changes the char type)
+ new uuchar unit that redefines char as widechar, and which is automatically
included by the compiler if {$modeswitch unicodestrings} is enabled
git-svn-id: branches/jvmbackend@18781 -
(that variable is not defined for all targets and is not necessary
anymore either)
* fixed building of win32/win64 (different because of the buildrtl unit)
git-svn-id: trunk@11419 -
