Re: [PATCH 3/8] Remove some unnecessary #ifndef WIN32
Fabrizio Gennari <[email protected]> Mon, 3 Dec 2018 22:43:29 +0100
| Newsgroups | gmane.linux.drivers.gnokii |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --===============0144596615396325561== Content-Type: multipart/alternative; boundary="------------38B2CF7B07ACD914B8CC461E" Content-Language: en-US This is a multi-part message in MIME format. --------------38B2CF7B07ACD914B8CC461E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Il 03-12-18 16:15, Pawel Kot ha scritto: > Hi, > > On Mon, Dec 3, 2018 at 12:41 PM Ladislav Michl <[email protected] > <mailto:[email protected]>> wrote: > > diff --git a/gnokii/gnokii-calendar.c b/gnokii/gnokii-calendar.c > > index e32bf769..10236bae 100644 > > --- a/gnokii/gnokii-calendar.c > > +++ b/gnokii/gnokii-calendar.c > > @@ -264,7 +264,6 @@ gn_error writecalendarnote(int argc, char > *argv[], gn_data *data, struct gn_stat > > -#ifndef WIN32 > > if (error == GN_ERR_NOTIMPLEMENTED) { > > switch (gn_vcal_file_event_read(optarg, > &calnote, i)) { > > Probably excluding it for all WIN32 platforms is excessive, but > gn_vcal_file_event_read() is generated by flex, which is missing on > native Windows platforms. I'm fine with changing it but it will fail > on Visual Studio platforms. Maybe I was using the same tree for Visual Studio and MinGW32? In that case, common/gnvcal.c would have been generated by MinGW32 and would have been available to Visual Studio. I haven't tried compiling with Visual Studio in the past days so I don't remember the details. > > > diff --git a/gnokii/gnokii-monitor.c b/gnokii/gnokii-monitor.c > > index 7fde06c5..30aba457 100644 > > --- a/gnokii/gnokii-monitor.c > > +++ b/gnokii/gnokii-monitor.c > > @@ -109,8 +109,6 @@ static gn_error readcbmessage(gn_cb_message > *message) > > > > static void displaycall(int call_id) > > { > > -/* FIXME!!! */ > > -#ifndef WIN32 > [...] > > struct timeval now, delta; > [...] > > -#endif > > I believe it was due to some weirdness of struct timeval on Windows. > Can you please tell on which compiling environments was it tested? > That definitely compiles using the i686-w64-mingw32-gcc cross-compiler running on Linux Cheers, Fabrizio --------------38B2CF7B07ACD914B8CC461E Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 8bit <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> <p><br> </p> <div class="moz-cite-prefix">Il 03-12-18 16:15, Pawel Kot ha scritto:<br> </div> <blockquote type="cite" cite="mid:CAHytCw5KuqBu24SU=dqbcG=MXPEAVGc=L7wFCyCYmrz0UDOXnA@mail.gmail.com"> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <div dir="ltr">Hi,<br> <br> On Mon, Dec 3, 2018 at 12:41 PM Ladislav Michl <<a href="mailto:[email protected]" moz-do-not-send="true">[email protected]</a>> wrote:<br> > diff --git a/gnokii/gnokii-calendar.c b/gnokii/gnokii-calendar.c<br> > index e32bf769..10236bae 100644<br> > --- a/gnokii/gnokii-calendar.c<br> > +++ b/gnokii/gnokii-calendar.c<br> > @@ -264,7 +264,6 @@ gn_error writecalendarnote(int argc, char *argv[], gn_data *data, struct gn_stat<br> > -#ifndef WIN32<br> > if (error == GN_ERR_NOTIMPLEMENTED) {<br> > switch (gn_vcal_file_event_read(optarg, &calnote, i)) { <div><br> </div> <div>Probably excluding it for all WIN32 platforms is excessive, but gn_vcal_file_event_read() is generated by flex, which is missing on native Windows platforms. I'm fine with changing it but it will fail on Visual Studio platforms.</div> </div> </blockquote> Maybe I was using the same tree for Visual Studio and MinGW32? In that case, common/gnvcal.c would have been generated by MinGW32 and would have been available to Visual Studio. I haven't tried compiling with Visual Studio in the past days so I don't remember the details.<br> <blockquote type="cite" cite="mid:CAHytCw5KuqBu24SU=dqbcG=MXPEAVGc=L7wFCyCYmrz0UDOXnA@mail.gmail.com"> <div dir="ltr"> <div><br> > diff --git a/gnokii/gnokii-monitor.c b/gnokii/gnokii-monitor.c<br> > index 7fde06c5..30aba457 100644<br> > --- a/gnokii/gnokii-monitor.c<br> > +++ b/gnokii/gnokii-monitor.c<br> > @@ -109,8 +109,6 @@ static gn_error readcbmessage(gn_cb_message *message)<br> ><br> > static void displaycall(int call_id)<br> > {<br> > -/* FIXME!!! */<br> > -#ifndef WIN32</div> <div>[...]<br> > struct timeval now, delta;</div> <div>[...]<br> > -#endif<br> <br> I believe it was due to some weirdness of struct timeval on Windows. Can you please tell on which compiling environments was it tested?<br> <br> </div> </div> </blockquote> <p>That definitely compiles using the i686-w64-mingw32-gcc cross-compiler running on Linux</p> <p>Cheers,</p> <p>Fabrizio<br> </p> </body> </html> --------------38B2CF7B07ACD914B8CC461E-- --===============0144596615396325561== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ gnokii-users mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/gnokii-users --===============0144596615396325561==--