| author | waspe <waspe> | 2003-11-04 17:18:09 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-04 17:18:09 (UTC) |
| commit | dcb673c3b856bc0392414116d36659f5f4bf18a5 (patch) (unidiff) | |
| tree | 6f5903334cb7457552082909d70a16dd7f2b049f /library/backend/vcc_yacc.cpp | |
| parent | 8dc71d4826633fba63618a509e84ca4a30f5addb (diff) | |
| download | opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.zip opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.gz opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.bz2 | |
resolved merge conflict
| -rw-r--r-- | library/backend/vcc_yacc.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
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 | |||
| @@ -157,7 +157,11 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. | |||
| 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 | ||
| @@ -167,3 +171,4 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. | |||
| 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 */ |