Can you change DynamicLoaderWindows calls to be #if defined(_MSC_VER)? Otherwise lgtm On Tue, Feb 10, 2015 at 8:17 AM Hafiz Abid Qadeer <abidh....@gmail.com> wrote:
> Hi zturner, > > Following changes are done. > 1. Add missing headers. > 2. Replace _snprintf with snprintf. It is already changed to _snprintf for > MSVC. > 3. Add a file in the build for autoconf. > 4. Exclude DynamicLoaderWindows::Terminate from mingw build as > DynamicLoaderWindows::Initialize is done. > > Built on Linux and Windows. > > http://reviews.llvm.org/D7536 > > Files: > source/Host/common/SocketAddress.cpp > source/Host/windows/Makefile > source/Utility/UriParser.cpp > source/lldb.cpp > > Index: source/Host/common/SocketAddress.cpp > =================================================================== > --- source/Host/common/SocketAddress.cpp > +++ source/Host/common/SocketAddress.cpp > @@ -9,10 +9,13 @@ > > #include "lldb/Host/SocketAddress.h" > #include <stddef.h> > +#include <stdio.h> > > // C Includes > #if !defined(_WIN32) > #include <arpa/inet.h> > +#else > +#include "lldb/Host/windows/win32.h" > #endif > #include <assert.h> > #include <string.h> > @@ -54,7 +57,7 @@ > { > char tmp[INET6_ADDRSTRLEN] = {0}; > const uint16_t* src16 = static_cast<const uint16_t*>(src); > - int full_size = _snprintf(tmp, sizeof(tmp), > + int full_size = ::snprintf(tmp, sizeof(tmp), > "%x:%x:%x:%x:%x:%x:%x:%x", > ntohs(src16[0]), > ntohs(src16[1]), ntohs(src16[2]), ntohs(src16[3]), > ntohs(src16[4]), > ntohs(src16[5]), ntohs(src16[6]), ntohs(src16[7]) > Index: source/Host/windows/Makefile > =================================================================== > --- source/Host/windows/Makefile > +++ source/Host/windows/Makefile > @@ -11,4 +11,6 @@ > LIBRARYNAME := lldbHostWindows > BUILD_ARCHIVE = 1 > > +SOURCES = $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp )) > $(PROJ_SRC_DIR)/../posix/ConnectionFileDescriptorPosix.cpp > + > include $(LLDB_LEVEL)/Makefile > Index: source/Utility/UriParser.cpp > =================================================================== > --- source/Utility/UriParser.cpp > +++ source/Utility/UriParser.cpp > @@ -11,6 +11,7 @@ > > // C Includes > #include <stdlib.h> > +#include <stdio.h> > > // C++ Includes > // Other libraries and framework includes > Index: source/lldb.cpp > =================================================================== > --- source/lldb.cpp > +++ source/lldb.cpp > @@ -298,7 +298,7 @@ > > Debugger::SettingsTerminate (); > > -#if defined (_WIN32) > +#if defined(_WIN32) && !defined(__MINGW32__) > DynamicLoaderWindows::Terminate(); > #endif > > EMAIL PREFERENCES > http://reviews.llvm.org/settings/panel/emailpreferences/ >
_______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
