Re: [PATCH 3/8] Remove some unnecessary #ifndef WIN32

[Fabrizio Gennari]

Il 03-12-18 16:15, Pawel Kot ha scritto:

Hi,

On Mon, Dec 3, 2018 at 12:41 PM Ladislav Michl <address@hidden> 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