X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=8b418928d28be458e1441502ba9920e41a0e1ca9;hb=f2da7dd588adb52148f0cd4779cde29b372cdc2e;hp=d65d4eb92f84a61486131d1fe52fc238ffd3939d;hpb=02497bfa999da26c19a92d8620c35bb97f1da711;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index d65d4eb92..8b418928d 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -87,43 +87,10 @@ typedef int ssize_t; -/* Convert formatted (xxx.xxx.xxx.xxx) string to in_addr struct */ -CoreExport int insp_inet_pton(int af, const char * src, void * dst); - -/* Convert struct to formatted (xxx.xxx.xxx.xxx) string */ -CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, socklen_t cnt); - -/* inet_pton/ntop require at least NT 6.0 */ -#define inet_pton insp_inet_pton -#define inet_ntop insp_inet_ntop - -/* Safe printf functions aren't defined in VC++ releases older than v14 */ -#if _MSC_VER <= 1800 -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#endif - -#ifndef va_copy -#define va_copy(dest, src) (dest = src) -#endif - -/* Unix-style sleep (argument is in seconds) */ -__inline void sleep(int seconds) { Sleep(seconds * 1000); } - /* _popen, _pclose */ #define popen _popen #define pclose _pclose -/* _access */ -#define access _access - -/* IPV4 only convert string to address struct */ -__inline int inet_aton(const char *cp, struct in_addr *addr) -{ - addr->s_addr = inet_addr(cp); - return (addr->s_addr == INADDR_NONE) ? 0 : 1; -}; - /* getopt() wrapper */ #define no_argument 0 #define required_argument 1 @@ -152,14 +119,6 @@ struct DIR bool first; }; -#if _MSC_VER <= 1800 -struct timespec -{ - time_t tv_sec; - long tv_nsec; -}; -#endif - CoreExport DIR * opendir(const char * path); CoreExport dirent * readdir(DIR * handle); CoreExport void closedir(DIR * handle); @@ -194,12 +153,6 @@ CoreExport void closedir(DIR * handle); // warning C4706: assignment within conditional expression #pragma warning(disable:4706) -// warning C4355: 'this' : used in base member initializer list -// This warning is disabled by default since VC2012 -#if _MSC_VER < 1700 -#pragma warning(disable:4355) -#endif - /* Shared memory allocation functions */ void * ::operator new(size_t iSize); void ::operator delete(void * ptr);