fixing incompatibility to orignal sharp rom

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
@@ -1300,16 +1300,21 @@ DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
         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
@@ -395,12 +395,27 @@ 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__ */