-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Well, I'm trying to get AbiWord to compile with CVS wv, and I ran into a
few problems.
1) You use // (c++ style) comments in wvparse.c. I know this is legal as
of C99, but not all compilers support it.
2) You name a variable bool in libole2/ms-ole-summary.h. As of C99, this
is now a reserved keyword. (gets you coming and going :-)
3) Dom, your last commit removed wvDocument_create(), which you claimed
was unused. However, it is used by your code in ie_exp_MsWord97.cpp, in
AbiWord.
The attached patch should fix all three of these issues. I'm still having
difficulty with the build, but the problems aren't as easy anymore. More
info later.
sam th
[EMAIL PROTECTED]
http://www.abisource.com/~sam/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.1 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE52FkKt+kM0Mq9M/wRAvU+AKCpMdH5J11YUTFUpPUXwfuWKFsJswCg10Rb
epHXWcL57sEMISqvP3RtfaU=
=NrYF
-----END PGP SIGNATURE-----
Index: wvparse.c
===================================================================
RCS file: /cvsroot/wvware/wv/wvparse.c,v
retrieving revision 1.2
diff -u -r1.2 wvparse.c
--- wvparse.c 2000/09/12 13:29:36 1.2
+++ wvparse.c 2000/10/02 09:40:03
@@ -120,7 +120,7 @@
{
wvError(("Theres a good chance that this is a word 2 doc of nFib
%d\n",read_16ubit(*mainfd)));
wvStream_rewind(*mainfd);
-// return(-1);
+ /*// return(-1);*/
return(0);
}
else if (0x37fe == magic)
Index: exporter/wvexporter.h
===================================================================
RCS file: /cvsroot/wvware/wv/exporter/wvexporter.h,v
retrieving revision 1.2
diff -u -r1.2 wvexporter.h
--- exporter/wvexporter.h 2000/10/02 00:13:26 1.2
+++ exporter/wvexporter.h 2000/10/02 09:40:03
@@ -27,6 +27,8 @@
void wvExporter_summaryPutLong(wvExporter *exp, U32 field, U32 l);
void wvExporter_summaryPutTime(wvExporter *exp, U32 field, time_t *t);
+ wvDocument* wvDocument_create(const char* fileName);
+
/* */
wvStream* wvStream_new(wvDocument* ole_file, const char* name);
int wvStream_write(void *ptr, size_t size, size_t nmemb, wvStream *in);
Index: libole2/ms-ole-summary.h
===================================================================
RCS file: /cvsroot/wvware/wv/libole2/ms-ole-summary.h,v
retrieving revision 1.2
diff -u -r1.2 ms-ole-summary.h
--- libole2/ms-ole-summary.h 2000/09/30 00:49:51 1.2
+++ libole2/ms-ole-summary.h 2000/10/02 09:40:03
@@ -179,7 +179,7 @@
const gchar *str);
void ms_ole_summary_set_boolean (MsOleSummary *si,
MsOleSummaryPID id,
- gboolean bool);
+ gboolean bool1);
void ms_ole_summary_set_short (MsOleSummary *si,
MsOleSummaryPID id,
guint16 i);
