summaryrefslogtreecommitdiff
authoreilers <eilers>2002-10-22 09:07:07 (UTC)
committer eilers <eilers>2002-10-22 09:07:07 (UTC)
commitbbb2c5fee87baa345ff5c16404204054442f5c11 (patch) (side-by-side diff)
tree7a61b3afc81c9c3d96bfe12e82689843bf58d972
parent896bea1ee64705bfc8753d7b3d1d51fddf43efaf (diff)
downloadopie-bbb2c5fee87baa345ff5c16404204054442f5c11.zip
opie-bbb2c5fee87baa345ff5c16404204054442f5c11.tar.gz
opie-bbb2c5fee87baa345ff5c16404204054442f5c11.tar.bz2
fixing incompatibility to orignal sharp rom
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/backend/vobject.cpp7
-rw-r--r--library/backend/vobject_p.h15
2 files changed, 21 insertions, 1 deletions
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index dab128e..2f22c20 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1282,34 +1282,39 @@ DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
{
QFileDirect f( fname);
if ( !f.open( IO_WriteOnly ) ) {
qWarning("Unable to open vobject write %s", fname);
return;
}
writeVObject( f.directHandle(),o );
}
DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
{
QFileDirect f( fname);
if ( !f.open( IO_WriteOnly ) ) {
qWarning("Unable to open vobject write %s", fname);
return;
}
while (list) {
writeVObject(f.directHandle(),list);
list = nextVObjectInList(list);
}
}
+#ifndef __SHARP_COMP_
+
+// This function is not available in the Sharp ROM for SL 5500 !
+// Therefore I have to move it into the header file.. (se)
+
DLLEXPORT(const char *) vObjectTypeInfo(VObject *o)
{
const char *type = vObjectName( o );
if ( strcmp( type, "TYPE" ) == 0 )
type = vObjectStringZValue( o );
return type;
}
-
+#endif
// end of source file vobject.c
diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index 0d0a2a8..bab22bb 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -377,30 +377,45 @@ typedef void (*MimeErrorHandler)(char *);
extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
/* NOTE regarding Parse_MIME_FromFile
The function above, Parse_MIME_FromFile, comes in two flavors,
neither of which is exported from the DLL. Each version takes
a CFile or FILE* as a parameter, neither of which can be
passed across a DLL interface (at least that is my experience).
If you are linking this code into your build directly then
you may find them a more convenient API that the other flavors
that take a file name. If you use them with the DLL LIB you
will get a link error.
*/
#if INCLUDEMFC
extern VObject* Parse_MIME_FromFile(CFile *file);
#else
extern VObject* Parse_MIME_FromFile(FILE *file);
#endif
+#define __SHARP_COMP_
+
+#ifndef __SHARP_COMP_
extern DLLEXPORT(const char *) vObjectTypeInfo(VObject *o);
+#else
+// This function is not available in the Sharp ROM for SL 5500 !
+// Therefore I have to move it into the header file.. (se)
+
+inline const char* vObjectTypeInfo(VObject *o)
+{
+ const char *type = vObjectName( o );
+ if ( strcmp( type, "TYPE" ) == 0 )
+ type = vObjectStringZValue( o );
+ return type;
+}
+#endif
#endif /* __VOBJECT_H__ */