summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-04 17:18:09 (UTC)
committer waspe <waspe>2003-11-04 17:18:09 (UTC)
commitdcb673c3b856bc0392414116d36659f5f4bf18a5 (patch) (unidiff)
tree6f5903334cb7457552082909d70a16dd7f2b049f
parent8dc71d4826633fba63618a509e84ca4a30f5addb (diff)
downloadopie-dcb673c3b856bc0392414116d36659f5f4bf18a5.zip
opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.gz
opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.bz2
resolved merge conflict
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/backend/vcc.y0
-rw-r--r--library/backend/vcc_yacc.cpp15
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
@@ -155,17 +155,22 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
155#include <stdlib.h> 155#include <stdlib.h>
156#include <ctype.h> 156#include <ctype.h>
157 157
158/*#ifdef PALMTOPCENTER */ 158/*#ifdef PALMTOPCENTER
159/*#include <qpe/vobject_p.h> */ 159*/
160/*#else */ 160/*#include <qpe/vobject_p.h>
161*/
162/*#else
163*/
161#include "vobject_p.h" 164#include "vobject_p.h"
162/*#endif */ 165/*#endif
166*/
163 167
164/**** Types, Constants ****/ 168/**** Types, Constants ****/
165 169
166 #define YYDEBUG 0/* 1 to compile in some debugging code */ 170 #define YYDEBUG 0/* 1 to compile in some debugging code */
167 #define MAXTOKEN 256/* maximum token (line) length */ 171 #define MAXTOKEN 256/* maximum token (line) length */
168 #define YYSTACKSIZE 100/* ~unref ? */ 172 #define YYSTACKSIZE 100/* ~unref ?
173*/
169 #define MAXLEVEL 10/* max # of nested objects parseable */ 174 #define MAXLEVEL 10/* max # of nested objects parseable */
170 /* (includes outermost) */ 175 /* (includes outermost) */
171 176