1 files changed, 9 insertions, 20 deletions

diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index bab22bb..f969898 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -99,9 +99,13 @@ For example:
         #define vCalendarMimeType"text/x-vCalendar"
 
 #undef DLLEXPORT
+        //#include <qtopia/qpeglobal.h>
 #include <qglobal.h>
-#if defined(Q_WS_WIN)
+
+#if defined(QTOPIA_MAKEDLL)
 #define DLLEXPORT(t)   __declspec(dllexport) t
+#elif defined(QTOPIA_DLL)
+#define DLLEXPORT(t)   __declspec(dllimport) t
 #else
 #define DLLEXPORT(t)   t
 #endif
@@ -351,7 +355,7 @@ extern DLLEXPORT(int) vObjectValueType(VObject *o);
         #define VCVT_VOBJECT5
         /* if the VObject has value set by setVObjectVObjectValue. */
 
-extern const char** fieldedProp;
+extern  DLLEXPORT(const char**) fieldedProp;
 
 /***************************************************
  * The methods below are implemented in vcc.c (generated from vcc.y )
@@ -368,7 +372,7 @@ your build directly then you may find them a more convenient API
 and you can go ahead and use them. If you try to use them with
 the DLL LIB you will get a link error.
 */
-extern void writeVObject(FILE *fp, VObject *o);
+extern DLLEXPORT(void) writeVObject(FILE *fp, VObject *o);
 
 
 
@@ -393,28 +397,13 @@ will get a link error.
 
 
 #if INCLUDEMFC
-extern VObject* Parse_MIME_FromFile(CFile *file);
+extern DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file);
 #else
-extern VObject* Parse_MIME_FromFile(FILE *file);
+extern DLLEXPORT(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__ */