PR 50556: comms/lirc doesn't build
Add patches to work around gcc inline mess.

Note: this package should be updated and the PR contains an update, but
I don't want to do that when I can't compile it (whereas simple mechanical
patches are much less likely to go astray...)


(dholland)

$NetBSD: patch-daemons_config__file.c,v 1.1 2016/05/02 02:32:14 dholland Exp $

Patch up gcc inline mess.

--- daemons/config_file.c~	2011-03-25 22:28:18.000000000 +0000
+++ daemons/config_file.c
@@ -77,7 +77,7 @@ int add_void_array(struct void_array *ar
 	return (1);
 }
 
-inline void *get_void_array(struct void_array *ar)
+static inline void *get_void_array(struct void_array *ar)
 {
 	return (ar->ptr);
 }

$NetBSD: patch-daemons_config__file.h,v 1.1 2016/05/02 02:32:14 dholland Exp $

Patch up gcc inline mess.

--- daemons/config_file.h~	2011-03-25 22:28:18.000000000 +0000
+++ daemons/config_file.h
@@ -67,7 +67,6 @@ struct void_array {
 
 void **init_void_array(struct void_array *ar, size_t chunk_size, size_t item_size);
 int add_void_array(struct void_array *ar, void *data);
-inline void *get_void_array(struct void_array *ar);
 
 /* some safer functions */
 void *s_malloc(size_t size);

$NetBSD: patch-daemons_receive.c,v 1.1 2016/05/02 02:32:14 dholland Exp $

Patch up gcc inline mess.

--- daemons/receive.c~	2011-03-25 22:28:18.000000000 +0000
+++ daemons/receive.c
@@ -25,12 +25,12 @@ extern struct ir_remote *last_remote;
 
 struct rbuf rec_buffer;
 
-inline lirc_t lirc_t_max(lirc_t a, lirc_t b)
+static inline lirc_t lirc_t_max(lirc_t a, lirc_t b)
 {
 	return (a > b ? a : b);
 }
 
-inline void set_pending_pulse(lirc_t deltap)
+static inline void set_pending_pulse(lirc_t deltap)
 {
 	LOGPRINTF(5, "pending pulse: %lu", deltap);
 	rec_buffer.pendingp = deltap;
@@ -378,7 +378,7 @@ inline int expectzero(struct ir_remote *
 	return (1);
 }
 
-inline lirc_t sync_rec_buffer(struct ir_remote * remote)
+static inline lirc_t sync_rec_buffer(struct ir_remote * remote)
 {
 	int count;
 	lirc_t deltas, deltap;
@@ -414,7 +414,7 @@ inline lirc_t sync_rec_buffer(struct ir_
 	return (deltas);
 }
 
-inline int get_header(struct ir_remote *remote)
+static inline int get_header(struct ir_remote *remote)
 {
 	if (is_rcmm(remote)) {
 		lirc_t deltap, deltas, sum;
@@ -524,7 +524,7 @@ inline int get_gap(struct ir_remote *rem
 	return (1);
 }
 
-inline int get_repeat(struct ir_remote *remote)
+static inline int get_repeat(struct ir_remote *remote)
 {
 	if (!get_lead(remote))
 		return (0);

$NetBSD: patch-daemons_receive.h,v 1.1 2016/05/02 02:32:14 dholland Exp $

Patch up gcc inline mess.

--- daemons/receive.h~	2011-03-25 22:28:18.000000000 +0000
+++ daemons/receive.h
@@ -39,7 +39,6 @@ static inline lirc_t receive_timeout(lir
 	return 2 * usec < MIN_RECEIVE_TIMEOUT ? MIN_RECEIVE_TIMEOUT : 2 * usec;
 }
 
-inline lirc_t lirc_t_max(lirc_t a, lirc_t b);
 void init_rec_buffer();
 int clear_rec_buffer(void);
 int receive_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flag,

$NetBSD: patch-daemons_transmit.c,v 1.1 2016/05/02 02:32:14 dholland Exp $

Patch up gcc inline mess.

--- daemons/transmit.c~	2011-03-25 22:28:18.000000000 +0000
+++ daemons/transmit.c
@@ -27,7 +27,7 @@ struct sbuf send_buffer;
 static void send_signals(lirc_t * signals, int n);
 static int init_send_or_sim(struct ir_remote *remote, struct ir_ncode *code, int sim, int repeat_preset);
 
-inline void set_bit(ir_code * code, int bit, int data)
+void set_bit(ir_code * code, int bit, int data)
 {
 	(*code) &= ~((((ir_code) 1) << bit));
 	(*code) |= ((ir_code) (data ? 1 : 0) << bit);

$NetBSD: patch-daemons_transmit.h,v 1.1 2016/05/02 02:32:14 dholland Exp $

Patch up gcc inline mess.

--- daemons/transmit.h~	2011-03-25 22:28:18.000000000 +0000
+++ daemons/transmit.h
@@ -29,7 +29,7 @@ struct sbuf {
 };
 
 void init_send_buffer(void);
-inline void set_bit(ir_code * code, int bit, int data);
+void set_bit(ir_code * code, int bit, int data);
 int init_send(struct ir_remote *remote, struct ir_ncode *code);
 int init_sim(struct ir_remote *remote, struct ir_ncode *code, int repeat_preset);