resolved merge conflict

2 files changed, 10 insertions, 5 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index bec2955..eca7c32 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 4006bc2..bc05f87 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -134,59 +134,64 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #endif

 

 

 #ifndef _NO_LINE_FOLDING

 #define _SUPPORT_LINE_FOLDING 1

 #endif

 

 /* undef below if compile with MFC */

 /* #define INCLUDEMFC 1 */

 

 #if defined(WIN32) || defined(_WIN32)

 #ifdef INCLUDEMFC

 #include <afx.h>

 #endif

 #endif

 

 #include <string.h>

 #ifndef __MWERKS__

 #include <stdlib.h>

 #endif

 #include <stdio.h>

 #include <stdlib.h>

 #include <ctype.h>

 

-/*#ifdef PALMTOPCENTER
*/
-/*#include <qpe/vobject_p.h>
*/
-/*#else
*/
+/*#ifdef PALMTOPCENTER
+*/
+/*#include <qpe/vobject_p.h>
+*/
+/*#else
+*/
 #include "vobject_p.h"

-/*#endif
*/
+/*#endif
+*/
 

 /****  Types, Constants  ****/

 

 #define YYDEBUG		0	/* 1 to compile in some debugging code */

 #define MAXTOKEN	256	/* maximum token (line) length */

-#define YYSTACKSIZE 	100	/* ~unref ?
*/
+#define YYSTACKSIZE 	100	/* ~unref ?
+*/
 #define MAXLEVEL	10	/* max # of nested objects parseable */

 				/* (includes outermost) */

 

 

 /****  Global Variables  ****/

 int mime_lineNum, mime_numErrors; /* yyerror() can use these */

 static VObject* vObjList;

 static VObject *curProp;

 static VObject *curObj;

 static VObject* ObjStack[MAXLEVEL];

 static int ObjStackTop;

 

 

 /* A helpful utility for the rest of the app. */

 #if __CPLUSPLUS__

 extern "C" {

 #endif

 

     extern void yyerror(char *s);

 

 #if __CPLUSPLUS__

     };

 #endif