summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 12:34:27 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 12:34:27 +0000
commit61f5e2c042ffa54b6e8a1f4e793b98c31807eba0 (patch)
tree142174224761cd96c8bcbe4e32e568f28926113a /rsc
parenta450a6676d06fc1bced36749e239924c7849bf0f (diff)
INTEGRATION: CWS obo05 (1.5.26); FILE MERGED
2006/06/22 14:17:22 obo 1.5.26.1: #i53611# .net 2005
Diffstat (limited to 'rsc')
-rw-r--r--rsc/source/parser/rsclex.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index a481ebb8c4f4..5b5614377a5b 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: rsclex.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 13:50:58 $
+ * last change: $Author: vg $ $Date: 2006-09-25 13:34:27 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -117,7 +117,7 @@ extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion
extern "C" void yyerror( const char * );
extern "C" int yylex( void );
#else
-#if defined ( WTC ) || defined ( GCC )
+#if defined ( WTC ) || defined ( GCC ) || (_MSC_VER >= 1400)
int yyparse(); // forward Deklaration fuer erzeugte Funktion
#else
yyparse(); // forward Deklaration fuer erzeugte Funktion