<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Probably I was not clear in the description. Previously whole of the file case surrounded by _<i>MSC</i>_VER which was changes to _WIN32 so that code can be
used for other compilers too. But there are certain declarations which are probably only needed on MSVC so they were surrounded by _<i>MSC</i>_VER. I suspect some are not even needed for MSVC too e.g. struct timeval which seems to present in winsock2.h for
both mingw and msvc. Defining snprintf to _snprintf is also a bit suspect as these functions have slightly different behaviour so I think it is better to restrict these definition to msvc.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Having said that, I am OK to go with your change if you still think that would be the better check.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Abid<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Saleem Abdulrasool [mailto:compnerd@compnerd.org]
<br>
<b>Sent:</b> 15 March 2014 02:54<br>
<b>To:</b> Abid, Hafiz<br>
<b>Cc:</b> lldb-commits@cs.uiuc.edu<br>
<b>Subject:</b> Re: [Lldb-commits] [lldb] r203781 - Hide some declarations from mingw.<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<div>
<p class="MsoNormal">On Thu, Mar 13, 2014 at 3:42 AM, Hafiz Abid Qadeer <<a href="mailto:hafiz_abid@mentor.com" target="_blank">hafiz_abid@mentor.com</a>> wrote:<o:p></o:p></p>
<p class="MsoNormal">Author: abidh<br>
Date: Thu Mar 13 05:42:28 2014<br>
New Revision: 203781<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=203781&view=rev" target="_blank">
http://llvm.org/viewvc/llvm-project?rev=203781&view=rev</a><br>
Log:<br>
Hide some declarations from mingw.<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Given this description, I don't think that this change is the proper way to handle this. Can you change the #ifdef _MSC_VER to if !defined(__MINGW32__) please? _MSC_VER indicates that you are using either the Microsoft compiler or clang
with Microsoft compatibility.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> <o:p></o:p></p>
</div>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<p class="MsoNormal">Modified:<br>
lldb/trunk/tools/driver/Platform.cpp<br>
lldb/trunk/tools/driver/Platform.h<br>
<br>
Modified: lldb/trunk/tools/driver/Platform.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Platform.cpp?rev=203781&r1=203780&r2=203781&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Platform.cpp?rev=203781&r1=203780&r2=203781&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/driver/Platform.cpp (original)<br>
+++ lldb/trunk/tools/driver/Platform.cpp Thu Mar 13 05:42:28 2014<br>
@@ -84,6 +84,7 @@ tcgetattr (int fildes, struct termios *t<br>
return -1;<br>
}<br>
<br>
+#ifdef _MSC_VER<br>
sighandler_t<br>
signal (int sig, sighandler_t sigFunc)<br>
{<br>
@@ -106,5 +107,6 @@ signal (int sig, sighandler_t sigFunc)<br>
}<br>
return 0;<br>
}<br>
+#endif<br>
<br>
#endif<br>
<br>
Modified: lldb/trunk/tools/driver/Platform.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Platform.h?rev=203781&r1=203780&r2=203781&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Platform.h?rev=203781&r1=203780&r2=203781&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/tools/driver/Platform.h (original)<br>
+++ lldb/trunk/tools/driver/Platform.h Thu Mar 13 05:42:28 2014<br>
@@ -16,18 +16,13 @@<br>
<br>
// this will stop signal.h being included<br>
#define _INC_SIGNAL<br>
-<br>
#include <io.h><br>
+#if defined( _MSC_VER )<br>
#include <eh.h><br>
+#endif<br>
#include <inttypes.h><br>
#include "lldb/Host/windows/windows.h"<br>
<br>
- struct timeval<br>
- {<br>
- long tv_sec;<br>
- long tv_usec;<br>
- };<br>
-<br>
struct winsize<br>
{<br>
long ws_col;<br>
@@ -65,13 +60,8 @@<br>
speed_t c_ospeed; // output speed<br>
};<br>
<br>
- typedef long pid_t;<br>
-<br>
#define STDIN_FILENO 0<br>
<br>
- #define PATH_MAX MAX_PATH<br>
- #define snprintf _snprintf<br>
-<br>
extern int ioctl( int d, int request, ... );<br>
extern int kill ( pid_t pid, int sig );<br>
extern int tcsetattr( int fd, int optional_actions, const struct termios *termios_p );<br>
@@ -86,7 +76,18 @@<br>
#define SIG_DFL ( (sighandler_t) -1 )<br>
// ignored<br>
#define SIG_IGN ( (sighandler_t) -2 )<br>
+<br>
+#ifdef _MSC_VER<br>
+ struct timeval<br>
+ {<br>
+ long tv_sec;<br>
+ long tv_usec;<br>
+ };<br>
+ typedef long pid_t;<br>
+ #define snprintf _snprintf<br>
extern sighandler_t signal( int sig, sighandler_t );<br>
+ #define PATH_MAX MAX_PATH<br>
+#endif<br>
<br>
#else<br>
<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><o:p></o:p></p>
</blockquote>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p class="MsoNormal">-- <br>
Saleem Abdulrasool<br>
compnerd (at) compnerd (dot) org <o:p></o:p></p>
</div>
</div>
</div>
</div>
</body>
</html>