irda-utils/irda-utils-0.9.18-gcc-6.1.0.patch

66 lines
2.6 KiB
Diff

diff -ru irda-utils-0.9.18.orig/findchip/nsc.c irda-utils-0.9.18/findchip/nsc.c
--- irda-utils-0.9.18.orig/findchip/nsc.c 2006-07-11 08:16:06.000000000 +0200
+++ irda-utils-0.9.18/findchip/nsc.c 2016-08-03 19:02:00.555842438 +0200
@@ -33,7 +33,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -ru irda-utils-0.9.18.orig/findchip/smc.c irda-utils-0.9.18/findchip/smc.c
--- irda-utils-0.9.18.orig/findchip/smc.c 2006-07-11 08:16:06.000000000 +0200
+++ irda-utils-0.9.18/findchip/smc.c 2016-08-03 19:01:45.991854499 +0200
@@ -32,7 +32,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -ru irda-utils-0.9.18.orig/findchip/winbond.c irda-utils-0.9.18/findchip/winbond.c
--- irda-utils-0.9.18.orig/findchip/winbond.c 2006-07-11 08:16:06.000000000 +0200
+++ irda-utils-0.9.18/findchip/winbond.c 2016-08-03 19:02:21.066824772 +0200
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -ru irda-utils-0.9.18.orig/irdadump/Makefile irda-utils-0.9.18/irdadump/Makefile
--- irda-utils-0.9.18.orig/irdadump/Makefile 2006-07-11 08:16:06.000000000 +0200
+++ irda-utils-0.9.18/irdadump/Makefile 2016-08-03 19:07:28.023483245 +0200
@@ -21,7 +21,7 @@
CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0`
-LIBIRDADUMP_OBJS = irdadump.o irlap.o irlmp.o obex.o ircomm.o netbuf.o capture.o
+LIBIRDADUMP_OBJS = irdadump.o irlmp.o irlap.o obex.o ircomm.o netbuf.o capture.o
IRDADUMP_OBJS = main.o
LIBIRDADUMP_TARGET = lib_irdadump.a
diff -ru irda-utils-0.9.18.orig/irdadump/irdadump.h irda-utils-0.9.18/irdadump/irdadump.h
--- irda-utils-0.9.18.orig/irdadump/irdadump.h 2006-07-11 08:16:06.000000000 +0200
+++ irda-utils-0.9.18/irdadump/irdadump.h 2016-08-03 19:14:59.839855966 +0200
@@ -219,10 +219,10 @@
guint8 caddr; /* LAP connection address (for garbage collect) */
};
-inline void parse_obex(GNetBuf *buf, GString *str, int cmd);
-inline void parse_irlmp(GNetBuf *buf, GString *str,
+void parse_obex(GNetBuf *buf, GString *str, int cmd);
+void parse_irlmp(GNetBuf *buf, GString *str,
guint8 caddr, int type, int cmd);
-inline void parse_ui_irlmp(GNetBuf *buf, GString *str, int type);
+void parse_ui_irlmp(GNetBuf *buf, GString *str, int type);
void parse_ircomm_params(guint8 clen, GNetBuf *buf, GString *str);
void parse_ircomm_connect(GNetBuf *buf, GString *str);
void parse_ircomm_lmp(GNetBuf *buf, GString *str);