i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The 'extern "C"' was missing for the C function replacement of the Version()

Browse Source 
method. Rather reintroduced the method (private) instead.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30854 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-05-25 23:32:53 +00:00
parent c26b324e20
commit 8c7bf264f5
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/translation/TranslatorRoster.h
+6 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007, Haiku, Inc. All Rights Reserved. * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _TRANSLATOR_ROSTER_H #ifndef _TRANSLATOR_ROSTER_H
@@ -41,7 +41,7 @@ class BTranslatorRoster : public BArchivable {
const char* hintMIME = NULL, uint32 wantType = 0); const char* hintMIME = NULL, uint32 wantType = 0);
virtual status_t GetTranslators(BPositionIO* source, virtual status_t GetTranslators(BPositionIO* source,
BMessage* ioExtension, translator_info** _info, int32* _numInfo, BMessage* ioExtension, translator_info** _info, int32* _numInfo,
uint32 hintType = 0, const char* hintMIME = NULL, uint32 hintType = 0, const char* hintMIME = NULL,
uint32 wantType = 0); uint32 wantType = 0);
@@ -94,6 +94,10 @@ class BTranslatorRoster : public BArchivable {
void _Initialize(); void _Initialize();
static const char* Version(int32* outCurVersion, int32* outMinVersion,
int32 inAppVersion);
// for backward compatiblity only
private: private:
friend class Private; friend class Private;
src/kits/translation/TranslatorRoster.cpp
+7 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007, Haiku, Inc. All Rights Reserved. * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -1700,8 +1700,10 @@ BTranslatorRoster::operator=(const BTranslatorRoster &tr)
} }
const char * #if __GNUC__ == 2 // gcc 2
Version__17BTranslatorRosterPlT1l(int32 *outCurVersion, int32 *outMinVersion,
/*static*/ const char*
BTranslatorRoster::Version(int32* outCurVersion, int32* outMinVersion,
int32 inAppVersion) int32 inAppVersion)
{ {
if (!outCurVersion || !outMinVersion) if (!outCurVersion || !outMinVersion)
@@ -1721,6 +1723,8 @@ Version__17BTranslatorRosterPlT1l(int32 *outCurVersion, int32 *outMinVersion,
return vString; return vString;
} }
#endif // gcc 2
void BTranslatorRoster::ReservedTranslatorRoster1() {} void BTranslatorRoster::ReservedTranslatorRoster1() {}
void BTranslatorRoster::ReservedTranslatorRoster2() {} void BTranslatorRoster::ReservedTranslatorRoster2() {}