mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

renamed NSGetFactory to build on Mac

This commit is contained in:
pierre%netscape.com 1998-08-05 08:17:06 +00:00
Родитель 26e3be487b
Коммит 4036ac81f1
5 изменённых файлов: 21 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
gfx/src/mac/nsGfxFactoryMac.cpp
Просмотреть файл

@ -160,7 +160,11 @@ nsresult nsGfxFactoryMac::LockFactory(PRBool aLock)
} }
// return the proper factory to the caller // return the proper factory to the caller
#ifdef XP_MAC
extern "C" NS_GFXNONXP nsresult NSGetFactory_GFXWIN_DLL(const nsCID &aClass, nsIFactory **aFactory)
#else
extern "C" NS_GFXNONXP nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) extern "C" NS_GFXNONXP nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
#endif
{ {
if (nsnull == aFactory) { if (nsnull == aFactory) {
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;

5
htmlparser/src/nsParserFactory.cpp
Просмотреть файл

@ -143,7 +143,11 @@ nsresult nsParserFactory::LockFactory(PRBool aLock)
} }
// return the proper factory to the caller // return the proper factory to the caller
#ifdef XP_MAC
extern "C" NS_EXPORT nsresult NSGetFactory_PARSER_DLL(const nsCID &aClass, nsIFactory **aFactory)
#else
extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
#endif
{ {
if (nsnull == aFactory) { if (nsnull == aFactory) {
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
@ -157,4 +161,3 @@ extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFa
return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory); return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
} }

5
parser/htmlparser/src/nsParserFactory.cpp
Просмотреть файл

@ -143,7 +143,11 @@ nsresult nsParserFactory::LockFactory(PRBool aLock)
} }
// return the proper factory to the caller // return the proper factory to the caller
#ifdef XP_MAC
extern "C" NS_EXPORT nsresult NSGetFactory_PARSER_DLL(const nsCID &aClass, nsIFactory **aFactory)
#else
extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
#endif
{ {
if (nsnull == aFactory) { if (nsnull == aFactory) {
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
@ -157,4 +161,3 @@ extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFa
return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory); return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
} }

4
view/src/nsViewFactory.cpp
Просмотреть файл

@ -150,7 +150,11 @@ nsresult nsViewFactory::LockFactory(PRBool aLock)
} }
// return the proper factory to the caller // return the proper factory to the caller
#ifdef XP_MAC
extern "C" NS_VIEW nsresult NSGetFactory_VIEW_DLL(const nsCID &aClass, nsIFactory **aFactory)
#else
extern "C" NS_VIEW nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) extern "C" NS_VIEW nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory)
#endif
{ {
if (nsnull == aFactory) { if (nsnull == aFactory) {
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;

5
webshell/src/nsDLLFactory.cpp
Просмотреть файл

@ -27,7 +27,11 @@ static NS_DEFINE_IID(kThrobberCID, NS_THROBBER_CID);
static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID); static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID);
extern "C" NS_WEB nsresult extern "C" NS_WEB nsresult
#ifdef XP_MAC
NSGetFactory_WEB_DLL(const nsCID& aClass, nsIFactory** aFactory)
#else
NSGetFactory(const nsCID& aClass, nsIFactory** aFactory) NSGetFactory(const nsCID& aClass, nsIFactory** aFactory)
#endif
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -47,3 +51,4 @@ NSGetFactory(const nsCID& aClass, nsIFactory** aFactory)
return rv; return rv;
} }