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
@@ -146,35 +146,40 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #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;