summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-04 17:18:09 (UTC)
committer waspe <waspe>2003-11-04 17:18:09 (UTC)
commitdcb673c3b856bc0392414116d36659f5f4bf18a5 (patch) (side-by-side diff)
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
@@ -156,9 +156,13 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
#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 ****/
@@ -166,5 +170,6 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
#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) */