From: Maël Hörz <ma...@us...> - 2009-01-06 16:26:06
|
Update of /cvsroot/synedit/SynEdit/Source In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5492 Modified Files: Tag: Unicode_2004_08_31 SynEdit.inc SynEditStrConst.pas Added Files: Tag: Unicode_2004_08_31 SynEditJedi.inc Removed Files: Tag: Unicode_2004_08_31 jedi.inc Log Message: Rename jedi.inc to SynEditJedi.inc to avoid problems with other versions of jedi.inc in the search path. --- jedi.inc DELETED --- Index: SynEdit.inc =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/SynEdit.inc,v retrieving revision 1.16.2.17 retrieving revision 1.16.2.18 diff -u -d -r1.16.2.17 -r1.16.2.18 --- SynEdit.inc 17 Sep 2008 13:59:11 -0000 1.16.2.17 +++ SynEdit.inc 6 Jan 2009 16:26:01 -0000 1.16.2.18 @@ -95,11 +95,12 @@ {$ENDIF} {------------------------------------------------------------------------------} -{ Pull in all defines from jedi.inc (must be done after the common compiler } -{ defines to work correctly) } +{ Pull in all defines from SynEditJedi.inc (must be done after the common } +{ compiler defines to work correctly). Use SynEdit-prefix to avoid problems } +{ with other versions of jedi.inc in the search-path. } {------------------------------------------------------------------------------} -{$I jedi.inc} +{$I SynEditJedi.inc} {------------------------------------------------------------------------------} { SYN_WIN32, SYN_LINUX and SYN_KYLIX defines } --- NEW FILE: SynEditJedi.inc --- {$IFNDEF JEDI_INC} {$DEFINE JEDI_INC} {**************************************************************************************************} { } { The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");} { you may not use this file except in compliance with the License. You may obtain a copy of the } { License at http://www.mozilla.org/MPL/ } { } { Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF } { ANY KIND, either express or implied. See the License for the specific language governing rights } { and limitations under the License. } { } { The Original Code is: jedi.inc. } { The Initial Developer of the Original Code is Project JEDI http://www.delphi-jedi.org } { } { Alternatively, the contents of this file may be used under the terms of the GNU Lesser General } { Public License (the "LGPL License"), in which case the provisions of the LGPL License are } { applicable instead of those above. If you wish to allow use of your version of this file only } [...1143 lines suppressed...] {$IFOPT L+} {$DEFINE LOCALSYMBOLS} {$ENDIF} {$IFOPT M+} {$DEFINE TYPEINFO_ON} {$ENDIF} {$IFOPT O+} {$DEFINE OPTIMIZATION_ON} {$ENDIF} {$IFOPT P+} {$DEFINE OPENSTRINGS_ON} {$ENDIF} {$IFOPT Q+} {$DEFINE OVERFLOWCHECKS_ON} {$ENDIF} {$IFOPT R+} {$DEFINE RANGECHECKS_ON} {$ENDIF} // Real compatibility {$IFOPT T+} {$DEFINE TYPEDADDRESS_ON} {$ENDIF} {$IFOPT U+} {$DEFINE SAFEDIVIDE_ON} {$ENDIF} {$IFOPT V+} {$DEFINE VARSTRINGCHECKS_ON} {$ENDIF} {$IFOPT W+} {$DEFINE STACKFRAMES_ON} {$ENDIF} // Warnings {$IFOPT X+} {$DEFINE EXTENDEDSYNTAX_ON} {$ENDIF} // for Delphi/BCB trial versions remove the point from the line below {.$UNDEF SUPPORTS_WEAKPACKAGEUNIT} {$ENDIF ~JEDI_INC} Index: SynEditStrConst.pas =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/SynEditStrConst.pas,v retrieving revision 1.41.2.4 retrieving revision 1.41.2.5 diff -u -d -r1.41.2.4 -r1.41.2.5 --- SynEditStrConst.pas 30 Jan 2008 20:39:46 -0000 1.41.2.4 +++ SynEditStrConst.pas 6 Jan 2009 16:26:01 -0000 1.41.2.5 @@ -433,7 +433,7 @@ SYNS_FilterCAClipper = 'CA-Clipper Files (*.prg;*.ch;*.inc)|*.prg;*.ch;*.inc'; SYNS_FilterCORBAIDL = 'CORBA IDL Files (*.idl)|*.idl'; SYNS_FilterCPM = 'CPM Reports (*.rdf;*.rif;*.rmf;*.rxf)|*.rdf;*.rif;*.rmf;*.rxf'; - SYNS_FilterCPP = 'C/C++ Files (*.c;*.cpp;*.cc;*.h;*.hpp;*.hh;*.cxx;*.hxx)|*.c;*.cpp;*.cc;*.h;*.hpp;*.hh;*.cxx;*.hxx'; + SYNS_FilterCPP = 'C/C++ Files (*.c;*.cpp;*.cc;*.h;*.hpp;*.hh;*.cxx;*.hxx;*.cu)|*.c;*.cpp;*.cc;*.h;*.hpp;*.hh;*.cxx;*.hxx;*.cu'; SYNS_FilterCS = 'C# Files (*.cs)|*.cs'; SYNS_FilterJava = 'Java Files (*.java)|*.java'; SYNS_FilterPerl = 'Perl Files (*.pl;*.pm;*.cgi)|*.pl;*.pm;*.cgi'; |