Merge branch 'feature/update-library-code' into develop

Author: delphidabbler

Src/3rdParty/PJMD5.pas

@@ -3,10 +3,10 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2010-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2010-2014, Peter Johnson (www.delphidabbler.com).
  *
- * $Rev$
- * $Date$
+ * $Rev: 1515 $
+ * $Date: 2014-01-11 02:36:28 +0000 (Sat, 11 Jan 2014) $
  *
  * This unit is a Delphi Pascal implementation of the MD5 Message-Digest
  * algorithm. See RFC1321 (http://www.faqs.org/rfcs/rfc1321.html).
@@ -31,12 +31,15 @@
 {$UNDEF CANCOMPILE}
 {$UNDEF RTLNAMESPACES}
 {$IFDEF CONDITIONALEXPRESSIONS}
-  {$IF CompilerVersion >= 20.0}   // Delphi 2009
-    {$DEFINE CANCOMPILE}
+  {$IF CompilerVersion >= 24.0} // Delphi XE3 and later
+    {$LEGACYIFEND ON}  // NOTE: this must come before all $IFEND directives
   {$IFEND}
-  {$IF CompilerVersion >= 23.0}   // Delphi XE2
+  {$IF CompilerVersion >= 23.0} // Delphi XE2 and later
     {$DEFINE RTLNAMESPACES}
   {$IFEND}
+  {$IF CompilerVersion >= 20.0} // Delphi 2009 and later
+    {$DEFINE CANCOMPILE}
+  {$IFEND}
 {$ENDIF}
 {$IFNDEF CANCOMPILE}
   {$MESSAGE FATAL 'Delphi 2009 or later required'}

Src/3rdParty/PJShellFolders.pas

@@ -3,10 +3,10 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2001-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2001-2014, Peter Johnson (www.delphidabbler.com).
  *
- * $Rev$
- * $Date$
+ * $Rev: 1515 $
+ * $Date: 2014-01-11 02:36:28 +0000 (Sat, 11 Jan 2014) $
  *
  * Run time unit that defines shell folders components, classes and routines.
 }
@@ -27,17 +27,20 @@ interface
   {$DEFINE DELPHI5ANDUP}
 {$ENDIF}
 {$IFDEF CONDITIONALEXPRESSIONS}
-  {$IF CompilerVersion >= 14.0} // Delphi 6 and later
-    {$DEFINE DELPHI5ANDUP}
-    {$DEFINE DELPHI6ANDUP}
+  {$IF CompilerVersion >= 24.0} // Delphi XE3 and later
+    {$LEGACYIFEND ON}  // NOTE: this must come before all $IFEND directives
+  {$IFEND}
+  {$IF CompilerVersion >= 23.0} // Delphi XE2 and later
+    {$DEFINE RTLNameSpaces}
   {$IFEND}
   {$IF CompilerVersion >= 15.0} // Delphi 7 and later
     {$DEFINE DELPHI7ANDUP}
     {$WARN UNSAFE_CODE OFF}
     {$WARN UNSAFE_CAST OFF}
   {$IFEND}
-  {$IF CompilerVersion >= 23.0} // Delphi XE2
-    {$DEFINE RTLNameSpaces}
+  {$IF CompilerVersion >= 14.0} // Delphi 6 and later
+    {$DEFINE DELPHI5ANDUP}
+    {$DEFINE DELPHI6ANDUP}
   {$IFEND}
 {$ENDIF}
 

Src/3rdParty/PJStreamWrapper.pas

@@ -3,10 +3,10 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2000-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2000-2014, Peter Johnson (www.delphidabbler.com).
  *
- * $Rev$
- * $Date$
+ * $Rev: 1515 $
+ * $Date: 2014-01-11 02:36:28 +0000 (Sat, 11 Jan 2014) $
  *
  * Defines the TPJStreamWrapper class. This is a base class for descendant
  * classes that "wrap" a TStream class to provide some form of filter or
@@ -22,14 +22,17 @@
 {$UNDEF SUPPORTS_TSTREAM64}
 {$UNDEF RTLNAMESPACES}
 {$IFDEF CONDITIONALEXPRESSIONS}
-  {$IF CompilerVersion >= 14.0} // >= Delphi 6
-    {$DEFINE SUPPORTS_TSTREAM64}
+  {$IF CompilerVersion >= 24.0} // Delphi XE3 and later
+    {$LEGACYIFEND ON}  // NOTE: this must come before all $IFEND directives
+  {$IFEND}
+  {$IF CompilerVersion >= 23.0} // Delphi XE2 and later
+    {$DEFINE RTLNAMESPACES}
   {$IFEND}
-  {$IF CompilerVersion >= 18.0} // >= Delphi 2006
+  {$IF CompilerVersion >= 18.0} // Delphi 2006 and later
     {$DEFINE SUPPORTS_STRICT}
   {$IFEND}
-  {$IF CompilerVersion >= 23.0} // >= Delphi XE2
-    {$DEFINE RTLNAMESPACES}
+  {$IF CompilerVersion >= 14.0} // Delphi 6 and later
+    {$DEFINE SUPPORTS_TSTREAM64}
   {$IFEND}
 {$ENDIF}