Kaydet (Commit) 9f683161 authored tarafından David Tardon's avatar David Tardon

fix linkage inconsistency on windows

Change-Id: I677a5fe8dc5c91b96fe299b06a5f2dc767120a1d
üst 953d9ab4
...@@ -81,7 +81,7 @@ struct RTUik ...@@ -81,7 +81,7 @@ struct RTUik
sal_uInt32 m_Data5; sal_uInt32 m_Data5;
}; };
/// specifies the calling onvention for type reader/wrter api /// specifies the calling convention for type reader/writer api
#define TYPEREG_CALLTYPE SAL_CALL #define TYPEREG_CALLTYPE SAL_CALL
#endif #endif
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#ifndef INCLUDED_registry_writer_h #ifndef INCLUDED_registry_writer_h
#define INCLUDED_registry_writer_h #define INCLUDED_registry_writer_h
#include "registry/regdllapi.h"
#include "registry/types.h" #include "registry/types.h"
#include "registry/version.h" #include "registry/version.h"
...@@ -70,7 +71,7 @@ extern "C" { ...@@ -70,7 +71,7 @@ extern "C" {
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
void * SAL_CALL typereg_writer_create( REG_DLLPUBLIC void * SAL_CALL typereg_writer_create(
typereg_Version version, rtl_uString const * documentation, typereg_Version version, rtl_uString const * documentation,
rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published, rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
rtl_uString const * typeName, sal_uInt16 superTypeCount, rtl_uString const * typeName, sal_uInt16 superTypeCount,
...@@ -85,7 +86,7 @@ void * SAL_CALL typereg_writer_create( ...@@ -85,7 +86,7 @@ void * SAL_CALL typereg_writer_create(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C(); REG_DLLPUBLIC void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
/** /**
Sets the type name of a super type of a type writer. Sets the type name of a super type of a type writer.
...@@ -102,7 +103,7 @@ void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C(); ...@@ -102,7 +103,7 @@ void SAL_CALL typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setSuperTypeName( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
void * handle, sal_uInt16 index, rtl_uString const * typeName) void * handle, sal_uInt16 index, rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -132,7 +133,7 @@ sal_Bool SAL_CALL typereg_writer_setSuperTypeName( ...@@ -132,7 +133,7 @@ sal_Bool SAL_CALL typereg_writer_setSuperTypeName(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setFieldData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setFieldData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name, rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
rtl_uString const * typeName, RTValueType valueType, rtl_uString const * typeName, RTValueType valueType,
...@@ -163,7 +164,7 @@ sal_Bool SAL_CALL typereg_writer_setFieldData( ...@@ -163,7 +164,7 @@ sal_Bool SAL_CALL typereg_writer_setFieldData(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setMethodData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTMethodMode flags, rtl_uString const * name, RTMethodMode flags, rtl_uString const * name,
rtl_uString const * returnTypeName, sal_uInt16 parameterCount, rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
...@@ -192,7 +193,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodData( ...@@ -192,7 +193,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodData(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setMethodParameterData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -215,7 +216,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodParameterData( ...@@ -215,7 +216,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
rtl_uString const * typeName) rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -241,7 +242,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName( ...@@ -241,7 +242,7 @@ sal_Bool SAL_CALL typereg_writer_setMethodExceptionTypeName(
@since UDK 3.2.0 @since UDK 3.2.0
*/ */
sal_Bool SAL_CALL typereg_writer_setReferenceData( REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setReferenceData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
...@@ -258,7 +259,7 @@ sal_Bool SAL_CALL typereg_writer_setReferenceData( ...@@ -258,7 +259,7 @@ sal_Bool SAL_CALL typereg_writer_setReferenceData(
the given type writer; if an out-of-memory condition occurs, null is returned the given type writer; if an out-of-memory condition occurs, null is returned
and <code>size</code> is not modified and <code>size</code> is not modified
*/ */
void const * SAL_CALL typereg_writer_getBlob(void * handle, sal_uInt32 * size) REG_DLLPUBLIC void const * SAL_CALL typereg_writer_getBlob(void * handle, sal_uInt32 * size)
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
#ifdef __cplusplus #ifdef __cplusplus
......
This diff is collapsed.
...@@ -1243,7 +1243,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil ...@@ -1243,7 +1243,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil
static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName); static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setFieldData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setFieldData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name, rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
rtl_uString const * typeName, RTValueType valueType, rtl_uString const * typeName, RTValueType valueType,
...@@ -1276,7 +1276,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry, ...@@ -1276,7 +1276,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry,
constValue); constValue);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setMethodData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTMethodMode flags, rtl_uString const * name, RTMethodMode flags, rtl_uString const * name,
rtl_uString const * returnTypeName, sal_uInt16 parameterCount, rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
...@@ -1306,7 +1306,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl hEntry, ...@@ -1306,7 +1306,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl hEntry,
hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount); hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setMethodParameterData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodParameterData(
void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName) RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1332,7 +1332,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl hEntry, ...@@ -1332,7 +1332,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl hEntry,
hEntry, index, paramIndex, mode, name, type); hEntry, index, paramIndex, mode, name, type);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setMethodExceptionTypeName( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodExceptionTypeName(
void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
rtl_uString const * typeName) rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1354,7 +1354,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl hEntry, ...@@ -1354,7 +1354,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl hEntry,
typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type); typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type);
} }
REG_DLLPUBLIC void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size) REG_DLLPUBLIC void const * TYPEREG_CALLTYPE typereg_writer_getBlob(void * handle, sal_uInt32 * size)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
TypeWriter * writer = static_cast< TypeWriter * >(handle); TypeWriter * writer = static_cast< TypeWriter * >(handle);
...@@ -1383,7 +1383,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry) ...@@ -1383,7 +1383,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry)
return size; return size;
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setReferenceData( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setReferenceData(
void * handle, sal_uInt16 index, rtl_uString const * documentation, void * handle, sal_uInt16 index, rtl_uString const * documentation,
RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName) RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
...@@ -1407,7 +1407,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl hEntry, ...@@ -1407,7 +1407,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl hEntry,
typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name); typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name);
} }
REG_DLLPUBLIC void * typereg_writer_create( REG_DLLPUBLIC void * TYPEREG_CALLTYPE typereg_writer_create(
typereg_Version version, rtl_uString const * documentation, typereg_Version version, rtl_uString const * documentation,
rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published, rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
rtl_uString const * typeName, sal_uInt16 superTypeCount, rtl_uString const * typeName, sal_uInt16 superTypeCount,
...@@ -1424,11 +1424,11 @@ REG_DLLPUBLIC void * typereg_writer_create( ...@@ -1424,11 +1424,11 @@ REG_DLLPUBLIC void * typereg_writer_create(
} }
} }
REG_DLLPUBLIC void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() { REG_DLLPUBLIC void TYPEREG_CALLTYPE typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() {
delete static_cast< TypeWriter * >(handle); delete static_cast< TypeWriter * >(handle);
} }
REG_DLLPUBLIC sal_Bool typereg_writer_setSuperTypeName( REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_writer_setSuperTypeName(
void * handle, sal_uInt16 index, rtl_uString const * typeName) void * handle, sal_uInt16 index, rtl_uString const * typeName)
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
...@@ -1457,7 +1457,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry( ...@@ -1457,7 +1457,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
return t; return t;
} }
RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void) REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void)
{ {
static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0}; static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0};
if (!aApi.acquire) if (!aApi.acquire)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment