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 | |
parent | 8dc71d4826633fba63618a509e84ca4a30f5addb (diff) | |
download | opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.zip opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.gz opie-dcb673c3b856bc0392414116d36659f5f4bf18a5.tar.bz2 |
resolved merge conflict
-rw-r--r-- | library/backend/vcc.y | 0 | ||||
-rw-r--r-- | library/backend/vcc_yacc.cpp | 15 |
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. | |||
134 | #endif | 134 | #endif |
135 | 135 | ||
136 | 136 | ||
137 | #ifndef _NO_LINE_FOLDING | 137 | #ifndef _NO_LINE_FOLDING |
138 | #define _SUPPORT_LINE_FOLDING 1 | 138 | #define _SUPPORT_LINE_FOLDING 1 |
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | /* undef below if compile with MFC */ | 141 | /* undef below if compile with MFC */ |
142 | /* #define INCLUDEMFC 1 */ | 142 | /* #define INCLUDEMFC 1 */ |
143 | 143 | ||
144 | #if defined(WIN32) || defined(_WIN32) | 144 | #if defined(WIN32) || defined(_WIN32) |
145 | #ifdef INCLUDEMFC | 145 | #ifdef INCLUDEMFC |
146 | #include <afx.h> | 146 | #include <afx.h> |
147 | #endif | 147 | #endif |
148 | #endif | 148 | #endif |
149 | 149 | ||
150 | #include <string.h> | 150 | #include <string.h> |
151 | #ifndef __MWERKS__ | 151 | #ifndef __MWERKS__ |
152 | #include <stdlib.h> | 152 | #include <stdlib.h> |
153 | #endif | 153 | #endif |
154 | #include <stdio.h> | 154 | #include <stdio.h> |
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 | ||
172 | 177 | ||
173 | /**** Global Variables ****/ | 178 | /**** Global Variables ****/ |
174 | int mime_lineNum, mime_numErrors; /* yyerror() can use these */ | 179 | int mime_lineNum, mime_numErrors; /* yyerror() can use these */ |
175 | static VObject* vObjList; | 180 | static VObject* vObjList; |
176 | static VObject *curProp; | 181 | static VObject *curProp; |
177 | static VObject *curObj; | 182 | static VObject *curObj; |
178 | static VObject* ObjStack[MAXLEVEL]; | 183 | static VObject* ObjStack[MAXLEVEL]; |
179 | static int ObjStackTop; | 184 | static int ObjStackTop; |
180 | 185 | ||
181 | 186 | ||
182 | /* A helpful utility for the rest of the app. */ | 187 | /* A helpful utility for the rest of the app. */ |
183 | #if __CPLUSPLUS__ | 188 | #if __CPLUSPLUS__ |
184 | extern "C" { | 189 | extern "C" { |
185 | #endif | 190 | #endif |
186 | 191 | ||
187 | extern void yyerror(char *s); | 192 | extern void yyerror(char *s); |
188 | 193 | ||
189 | #if __CPLUSPLUS__ | 194 | #if __CPLUSPLUS__ |
190 | }; | 195 | }; |
191 | #endif | 196 | #endif |
192 | 197 | ||