Cured some small doc typos; some WIN16 fixes; transferred DLL WinMain to

IMPLEMENT_APP() macro so dummy.obj doesn't have to be linked; lexer.l fix
for LEX (I hope)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-10 22:44:53 +00:00
parent debdd17e99
commit 750b78ba35
31 changed files with 188 additions and 91 deletions

View File

@@ -34,7 +34,7 @@
#include <netdb.h>
#include <signal.h>
#if defined(__SVR4__) && !defined(__HPUX__)
#if defined(__SOLARIS__) || defined(__SVR4__) && !defined(__HPUX__)
#include <sys/systeminfo.h>
#endif
@@ -61,7 +61,7 @@ extern wxList wxTopLevelWindows;
// Get full hostname (eg. DoDo.BSn-Germany.crg.de)
bool wxGetHostName(char *buf, int maxSize)
{
#if defined(__SVR4__) && !defined(__HPUX__)
#if defined(__SOLARIS__) || defined(__SVR4__) && !defined(__HPUX__)
return (sysinfo (SI_HOSTNAME, buf, maxSize) != -1);
#else /* BSD Sockets */
char name[255];
@@ -491,7 +491,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
size_t len;
environment = GetIniFile (filename, NULL);
len = strlen (environment);
#if defined(__SVR4__) && !defined(__HPUX__)
#if defined(__SOLARIS__) || defined(__SVR4__) && !defined(__HPUX__)
(void) sysinfo (SI_HOSTNAME, environment + len, 1024 - len);
#else
(void) gethostname (environment + len, 1024 - len);