1. DLL compilation fixes (wrong WXDLLEXPORT placement) in db.h/cpp

2. dummy typedef added to gsocket.c - trans unit can't be empty
3. WX_DEFINE_EXPORTED_ARRAY & friends appear


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-12 23:57:40 +00:00
parent 755c41bf1e
commit a497618a56
10 changed files with 51 additions and 28 deletions

View File

@@ -84,7 +84,7 @@
#include "wx/db.h"
#endif
DbList* WXDLLEXPORT PtrBegDbList = 0;
DbList WXDLLEXPORT *PtrBegDbList = 0;
#if __WXDEBUG__ > 0
#if wxMAJOR_VERSION == 2
@@ -1728,7 +1728,7 @@ DBMS wxDB::Dbms(void)
/********** GetDbConnection() **********/
wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)
wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff)
{
DbList *pList;

View File

@@ -119,7 +119,7 @@ private:
m_ext;
};
WX_DECLARE_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo);
WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo);
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo);

View File

@@ -1350,12 +1350,16 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
return GSOCK_INVADDR;
}
#else /* !wxUSE_SOCKETS */
/*
* translation unit shouldn't be empty, so include this typedef to make the
* compiler (VC++ 6.0, for example) happy
*/
typedef (*wxDummy)();
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
/* Diferencias con la version Unix:
* - El descriptor es SOCKET y no int
* - Constantes -1 pasan a INVALID_SOCKET