Unverified Commit fb1f4f4e authored by Wander Hillen's avatar Wander Hillen Committed by GitHub
Browse files

Merge branch 'unstable' into minor-typos

parents dda8cc18 6e98214f
...@@ -2,10 +2,20 @@ ...@@ -2,10 +2,20 @@
#define _WIN32_HELPER_INCLUDE #define _WIN32_HELPER_INCLUDE
#ifdef _MSC_VER #ifdef _MSC_VER
#include <winsock2.h> /* for struct timeval */
#ifndef inline #ifndef inline
#define inline __inline #define inline __inline
#endif #endif
#ifndef strcasecmp
#define strcasecmp stricmp
#endif
#ifndef strncasecmp
#define strncasecmp strnicmp
#endif
#ifndef va_copy #ifndef va_copy
#define va_copy(d,s) ((d) = (s)) #define va_copy(d,s) ((d) = (s))
#endif #endif
...@@ -37,6 +47,10 @@ __inline int c99_snprintf(char* str, size_t size, const char* format, ...) ...@@ -37,6 +47,10 @@ __inline int c99_snprintf(char* str, size_t size, const char* format, ...)
return count; return count;
} }
#endif #endif
#endif /* _MSC_VER */
#endif #ifdef _WIN32
#endif #define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
\ No newline at end of file #endif /* _WIN32 */
#endif /* _WIN32_HELPER_INCLUDE */
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Unless otherwise specified, files in the jemalloc source distribution are Unless otherwise specified, files in the jemalloc source distribution are
subject to the following license: subject to the following license:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Copyright (C) 2002-2015 Jason Evans <jasone@canonware.com>. Copyright (C) 2002-2018 Jason Evans <jasone@canonware.com>.
All rights reserved. All rights reserved.
Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved. Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved.
Copyright (C) 2009-2015 Facebook, Inc. All rights reserved. Copyright (C) 2009-2018 Facebook, Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
4.0.3-0-ge9192eacf8935e29fc62fddc2701f7942b1cc02c 5.1.0-0-g0
...@@ -18,6 +18,7 @@ Options: ...@@ -18,6 +18,7 @@ Options:
--cc : Print compiler used to build jemalloc. --cc : Print compiler used to build jemalloc.
--cflags : Print compiler flags used to build jemalloc. --cflags : Print compiler flags used to build jemalloc.
--cppflags : Print preprocessor flags used to build jemalloc. --cppflags : Print preprocessor flags used to build jemalloc.
--cxxflags : Print C++ compiler flags used to build jemalloc.
--ldflags : Print library flags used to build jemalloc. --ldflags : Print library flags used to build jemalloc.
--libs : Print libraries jemalloc was linked against. --libs : Print libraries jemalloc was linked against.
EOF EOF
...@@ -67,6 +68,9 @@ case "$1" in ...@@ -67,6 +68,9 @@ case "$1" in
--cppflags) --cppflags)
echo "@CPPFLAGS@" echo "@CPPFLAGS@"
;; ;;
--cxxflags)
echo "@CXXFLAGS@"
;;
--ldflags) --ldflags)
echo "@LDFLAGS@ @EXTRA_LDFLAGS@" echo "@LDFLAGS@ @EXTRA_LDFLAGS@"
;; ;;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment