1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-06 07:44:57 +03:00

v4.05-9416-beta

This commit is contained in:
dnobori
2014-02-06 01:36:42 +09:00
parent 8920d01a37
commit bb853cc18b
306 changed files with 523 additions and 317 deletions

View File

@ -215,7 +215,7 @@ FOLDER *CfgBufTextToFolder(BUF *b);
FOLDER *CfgBufBinToFolder(BUF *b);
void CfgReadNextFolderBin(BUF *b, FOLDER *parent);
char *CfgReadNextLine(BUF *b);
bool CfgReadNextTextBuf(BUF *b, FOLDER *current);
bool CfgReadNextTextBUF(BUF *b, FOLDER *current);
void CfgSave(FOLDER *f, char *name);
void CfgSaveW(FOLDER *f, wchar_t *name);
bool CfgSaveEx(CFG_RW *rw, FOLDER *f, char *name);

View File

@ -942,7 +942,7 @@ void SetThreadName(UINT thread_id, char *name, void *param)
}
else
{
sprintf(tmp, "%s (0x%x)", name, param);
sprintf(tmp, "%s (0x%x)", name, (UINT)param);
}
Win32SetThreadName(thread_id, tmp);
@ -1756,7 +1756,7 @@ void TimeToTm(struct tm *t, time_t time)
ret = gmtime(&time);
#else // OS_UNIX
ret = malloc(sizeof(struct tm));
memset(ret, 0, sizeof(ret));
memset(ret, 0, sizeof(struct tm));
gmtime_r(&time, ret);
#endif // OS_UNIX
@ -1795,7 +1795,7 @@ void NormalizeTm(struct tm *t)
ret = gmtime(&tmp);
#else // OS_UNIX
ret = malloc(sizeof(struct tm));
memset(ret, 0, sizeof(ret));
memset(ret, 0, sizeof(struct tm));
gmtime_r(&tmp, ret);
#endif // OS_UNIX

View File

@ -124,7 +124,7 @@ typedef struct x509_crl_st X509_CRL;
#define BUF_SIZE 512
// Support Windows OS list
#define SUPPORTED_WINDOWS_LIST "Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Server 2003 SP2 / Vista SP1, SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / 7 SP1 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / 8 / Server 2012 / Hyper-V Server 2012 / 8.1 / Server 2012 R2 / Hyper-V Server 2012 R2"
#define SUPPORTED_WINDOWS_LIST "Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2"
// Infinite
#ifndef WINDOWS_H

View File

@ -295,7 +295,7 @@ struct tuninfo {
#else // UNIX_BSD
#endif // UNIX_BSD || UNIX_MACOS
#endif // defined(UNIX_BSD) || (!defined(NO_VLAN) && defined(UNIX_MACOS))
#endif // UNIX_SOLARIS

View File

@ -12,7 +12,9 @@
// http://www.softether.org/
//
// Authors: Daiyuu Nobori
// Contributors: Melvyn (https://github.com/yaurthek)
// Contributors:
// - Melvyn (https://github.com/yaurthek)
// - nattoheaven (https://github.com/nattoheaven)
// Comments: Tetsuo Sugiyama, Ph.D.
//
//
@ -128,9 +130,9 @@ struct statfs {
char f_mntonname[90]; /* directory on which mounted */
char f_mntfromname[90];/* mounted filesystem */
};
#else
#else // NO_VLAN
#include <sys/mount.h>
#endif
#endif // NO_VLAN
#endif // UNIX_MACOS
// Scandir() function for Solaris