Re: MinGW-related patches that were reported in 2014 but not applied

2016-07-22 Thread Eli Zaretskii
Ping!  Two out of 3 patches sent here:

  https://lists.gnu.org/archive/html/guile-devel/2016-07/msg00085.html

are still waiting to be accepted.

Thanks.



Re: Avoid warnings in sockets.c when HAVE_SIN6_SCOPE_ID is unavailable

2016-07-22 Thread Eli Zaretskii
Ping!

> Date: Sat, 16 Jul 2016 20:16:35 +0300
> From: Eli Zaretskii 
> 
> CC   libguile_2.0_la-socket.lo
>   socket.c: In function 'scm_fill_sockaddr':
>   socket.c:747:16: warning: variable 'scope_id' set but not used 
> [-Wunused-but-set-variable]
> unsigned long scope_id = 0;
> ^
> 
> The patch to avoid this warning is below.  OK to commit?
> 
> --- libguile/socket.c~0   2016-01-02 16:24:55.0 +0200
> +++ libguile/socket.c 2016-07-15 19:17:40.02325 +0300
> @@ -744,7 +744,9 @@ scm_fill_sockaddr (int fam, SCM address,
>   int port;
>   struct sockaddr_in6 *soka;
>   unsigned long flowinfo = 0;
> +#ifdef HAVE_SIN6_SCOPE_ID
>   unsigned long scope_id = 0;
> +#endif
>  
>   SCM_VALIDATE_CONS (which_arg + 1, *args);
>   port = scm_to_int (SCM_CAR (*args));
> @@ -755,8 +757,10 @@ scm_fill_sockaddr (int fam, SCM address,
>   *args = SCM_CDR (*args);
>   if (scm_is_pair (*args))
> {
> +#ifdef HAVE_SIN6_SCOPE_ID
>   SCM_VALIDATE_ULONG_COPY (which_arg + 3, SCM_CAR (*args),
>scope_id);
> +#endif
>   *args = SCM_CDR (*args);
> }
> }
> 
> 



Re: Avoid warnings in threads.c when building without threads

2016-07-22 Thread Eli Zaretskii
Ping!

> Date: Sat, 16 Jul 2016 20:12:22 +0300
> From: Eli Zaretskii 
> 
>  CC   libguile_2.0_la-threads.lo
>In file included from ../libguile/threads.h:40:0,
>   from ../libguile/gc.h:30,
>   from ../libguile/_scm.h:76,
>   from threads.c:28:
>threads.c: In function 'scm_call_with_new_thread':
>../libguile/null-threads.h:74:53: warning: right-hand operand of comma 
> expression has no effect [-Wunused-value]
> #define scm_i_pthread_cond_wait(c,m)(abort(), 0)
>   ^
>../libguile/null-threads.h:102:45: note: in expansion of macro 
> 'scm_i_pthread_cond_wait'
> #define scm_i_scm_pthread_cond_wait scm_i_pthread_cond_wait
>   ^
>threads.c:1061:5: note: in expansion of macro 'scm_i_scm_pthread_cond_wait'
>   scm_i_scm_pthread_cond_wait (&data.cond, &data.mutex);
>   ^
> 
> The patch to shut up these warnings is below.  OK to commit?
> 
> --- libguile/null-threads.h~0 2016-01-02 13:32:40.0 +0200
> +++ libguile/null-threads.h   2016-07-15 17:47:37.101375000 +0300
> @@ -43,7 +43,7 @@
>  #define scm_i_pthread_create(t,a,f,d)   (*(t)=0, (void)(f), ENOSYS)
>  #define scm_i_pthread_detach(t) do { } while (0)
>  #define scm_i_pthread_exit(v)   exit (EXIT_SUCCESS)
> -#define scm_i_pthread_cancel(t) 0
> +#define scm_i_pthread_cancel(t) (void)0
>  #define scm_i_pthread_cleanup_push(t,v) 0
>  #define scm_i_pthread_cleanup_pop(e)0
>  #define scm_i_sched_yield() 0
> 
> 
> --- libguile/threads.c~   2016-06-20 23:35:06.0 +0300
> +++ libguile/threads.c2016-07-15 17:48:20.757625000 +0300
> @@ -1058,7 +1058,7 @@ SCM_DEFINE (scm_call_with_new_thread, "c
>  }
>  
>while (scm_is_false (data.thread))
> -scm_i_scm_pthread_cond_wait (&data.cond, &data.mutex);
> +(void)scm_i_scm_pthread_cond_wait (&data.cond, &data.mutex);
>  
>scm_i_pthread_mutex_unlock (&data.mutex);
>  
> @@ -1138,7 +1138,7 @@ scm_spawn_thread (scm_t_catch_body body,
>  }
>  
>while (scm_is_false (data.thread))
> -scm_i_scm_pthread_cond_wait (&data.cond, &data.mutex);
> +(void)scm_i_scm_pthread_cond_wait (&data.cond, &data.mutex);
>  
>scm_i_pthread_mutex_unlock (&data.mutex);
>  
> 
> 



Re: Avoid warning about alloca in read.c

2016-07-22 Thread Eli Zaretskii
Ping!

> Date: Sat, 16 Jul 2016 20:18:26 +0300
> From: Eli Zaretskii 
> 
>CC   libguile_2.0_la-read.lo
>  read.c: In function 'try_read_ci_chars':
>  read.c:983:3: warning: implicit declaration of function 'alloca' 
> [-Wimplicit-function-declaration]
>  read.c:983:22: warning: incompatible implicit declaration of built-in 
> function 'alloca' [enabled by default]
> 
> The patch to avoid this warning is below.  OK to commit?
> 
> --- libguile/read.c~0 2016-01-02 16:24:55.0 +0200
> +++ libguile/read.c   2016-07-15 12:38:42.195125000 +0300
> @@ -33,6 +33,10 @@
>  #include 
>  #include 
>  
> +#ifdef __MINGW32__
> +#include 
> +#endif
> +
>  #include "libguile/_scm.h"
>  #include "libguile/bytevectors.h"
>  #include "libguile/chars.h"
> 
>