diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
| commit | a1a007a4856fa50d6d811c2268f881e3666f4c67 (patch) | |
| tree | 24b082c1bfb5777f1770c82a534bf765160bc1b8 /media/mtransport | |
| parent | eddd0de2ae80e176011f41a5400e81522d53f4f3 (diff) | |
| parent | 59bf4204a84f7638d3f89a29bc7c04e5dc401369 (diff) | |
| download | UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.gz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.lz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.xz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into html_input_datetime_1
Diffstat (limited to 'media/mtransport')
| -rw-r--r-- | media/mtransport/third_party/nrappkit/src/util/util.c | 15 | ||||
| -rw-r--r-- | media/mtransport/third_party/nrappkit/src/util/util.h | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/media/mtransport/third_party/nrappkit/src/util/util.c b/media/mtransport/third_party/nrappkit/src/util/util.c index 31a245f45..1e2801259 100644 --- a/media/mtransport/third_party/nrappkit/src/util/util.c +++ b/media/mtransport/third_party/nrappkit/src/util/util.c @@ -506,7 +506,7 @@ strlcat(dst, src, siz) #endif /* LINUX or WIN32 */ -#if defined(USE_OWN_INET_NTOP) || defined(WIN32) +#if defined(USE_OWN_INET_NTOP) || (defined(WIN32) && WINVER < 0x0600) #include <errno.h> #ifdef WIN32 #include <Ws2ipdef.h> @@ -775,18 +775,5 @@ int gettimeofday(struct timeval *tv, void *tz) return 0; } -#if _MSC_VER < 1900 -int snprintf(char *buffer, size_t n, const char *format, ...) -{ - va_list argp; - int ret; - va_start(argp, format); - ret = _vscprintf(format, argp); - vsnprintf_s(buffer, n, _TRUNCATE, format, argp); - va_end(argp); - return ret; -} -#endif - #endif diff --git a/media/mtransport/third_party/nrappkit/src/util/util.h b/media/mtransport/third_party/nrappkit/src/util/util.h index 869b72863..975baa4aa 100644 --- a/media/mtransport/third_party/nrappkit/src/util/util.h +++ b/media/mtransport/third_party/nrappkit/src/util/util.h @@ -64,8 +64,7 @@ int nr_write_pid_file(char *pid_filename); int nr_reg_uint4_fetch_and_check(NR_registry key, UINT4 min, UINT4 max, int log_fac, int die, UINT4 *val); int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_fac, int die, UINT8 *val); -#ifdef WIN32 -int snprintf(char *buffer, size_t n, const char *format, ...); +#if defined(WIN32) && WINVER < 0x0600 const char *inet_ntop(int af, const void *src, char *dst, size_t size); int inet_pton(int af, const char *src, void *dst); #endif |