4becc237ee
- photocard.py: fixed broken import statement (bsc#1071255)
* added photocard-fix-import-error-for-pcardext.patch
* spec file: fixed dependency for dbus-1-python (Leap42.2)
- Use python3 on tumbleweed and SLE15/Leap15 (bsc#1071255)
* add pcardext-python3-fixes.patch
* add hplip-misc-missing-includes-and-definitions.patch
* hp_ipp.h-add-missing-prototypes.patch
* spec file: replace "/usr/bin/env python" and "/usr/bin/python" with
desired interpreter
* spec file: add py2/py3 selection macros
* spec file: dropped python-openssl build dependency (not needed anymore)
OBS-URL: https://build.opensuse.org/request/show/589977
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=151
63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
From 6dd5de8c21284530a7d9716b979812446cc4eb79 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 21 Mar 2018 23:56:05 +0100
|
|
Subject: [PATCH] hplip: misc missing #includes and definitions
|
|
|
|
---
|
|
protocol/discovery/mdns.c | 1 +
|
|
protocol/discovery/mdns.h | 1 +
|
|
scan/sane/hpaio.c | 1 +
|
|
scan/sane/http.c | 1 +
|
|
4 files changed, 4 insertions(+)
|
|
|
|
diff --git a/protocol/discovery/mdns.c b/protocol/discovery/mdns.c
|
|
index 75ef0eab7214..c58d218390f5 100644
|
|
--- a/protocol/discovery/mdns.c
|
|
+++ b/protocol/discovery/mdns.c
|
|
@@ -40,6 +40,7 @@
|
|
#include <net/if.h>
|
|
#include "mdns.h"
|
|
#include <unistd.h>
|
|
+#include <ctype.h>
|
|
#include <sys/ioctl.h>
|
|
|
|
/* Convert "www.google.com" to "3www6google3com". */
|
|
diff --git a/protocol/discovery/mdns.h b/protocol/discovery/mdns.h
|
|
index 56d8847da28a..d64e668fe194 100644
|
|
--- a/protocol/discovery/mdns.h
|
|
+++ b/protocol/discovery/mdns.h
|
|
@@ -105,5 +105,6 @@ static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_m
|
|
static DNS_RECORD* send_and_receive(struct mdns_socket *mdns_sock, const char *name,
|
|
int query_type, int read_mode);
|
|
static int get_ipv4_address(const char *iface, struct in_addr *addr);
|
|
+int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count);
|
|
#endif // _DISCOVERY_MDNS_H
|
|
|
|
diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c
|
|
index ae34cfb63fd9..28899d10bae3 100644
|
|
--- a/scan/sane/hpaio.c
|
|
+++ b/scan/sane/hpaio.c
|
|
@@ -46,6 +46,7 @@
|
|
#include "sclpml.h"
|
|
#include "escl.h"
|
|
#include "io.h"
|
|
+#include "mdns.h"
|
|
|
|
#define DEBUG_DECLARE_ONLY
|
|
#include "sanei_debug.h"
|
|
diff --git a/scan/sane/http.c b/scan/sane/http.c
|
|
index 800df91bb3f3..ae5edf4c8fe8 100644
|
|
--- a/scan/sane/http.c
|
|
+++ b/scan/sane/http.c
|
|
@@ -33,6 +33,7 @@
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#include <unistd.h>
|
|
#include <string.h>
|
|
#include <syslog.h>
|
|
#include <ctype.h>
|
|
--
|
|
2.16.1
|
|
|