Skip to content

Commit bb88ae6

Browse files
author
delphidabbler
committed
Update PJShellFolders unit to v2.3.2 of 11 Jan 2014
1 parent e912f6d commit bb88ae6

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

Src/3rdParty/PJShellFolders.pas

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2001-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2001-2014, Peter Johnson (www.delphidabbler.com).
77
*
8-
* $Rev$
9-
* $Date$
8+
* $Rev: 1515 $
9+
* $Date: 2014-01-11 02:36:28 +0000 (Sat, 11 Jan 2014) $
1010
*
1111
* Run time unit that defines shell folders components, classes and routines.
1212
}
@@ -27,17 +27,20 @@ interface
2727
{$DEFINE DELPHI5ANDUP}
2828
{$ENDIF}
2929
{$IFDEF CONDITIONALEXPRESSIONS}
30-
{$IF CompilerVersion >= 14.0} // Delphi 6 and later
31-
{$DEFINE DELPHI5ANDUP}
32-
{$DEFINE DELPHI6ANDUP}
30+
{$IF CompilerVersion >= 24.0} // Delphi XE3 and later
31+
{$LEGACYIFEND ON} // NOTE: this must come before all $IFEND directives
32+
{$IFEND}
33+
{$IF CompilerVersion >= 23.0} // Delphi XE2 and later
34+
{$DEFINE RTLNameSpaces}
3335
{$IFEND}
3436
{$IF CompilerVersion >= 15.0} // Delphi 7 and later
3537
{$DEFINE DELPHI7ANDUP}
3638
{$WARN UNSAFE_CODE OFF}
3739
{$WARN UNSAFE_CAST OFF}
3840
{$IFEND}
39-
{$IF CompilerVersion >= 23.0} // Delphi XE2
40-
{$DEFINE RTLNameSpaces}
41+
{$IF CompilerVersion >= 14.0} // Delphi 6 and later
42+
{$DEFINE DELPHI5ANDUP}
43+
{$DEFINE DELPHI6ANDUP}
4144
{$IFEND}
4245
{$ENDIF}
4346

0 commit comments

Comments
 (0)