45 lines
1.6 KiB
Plaintext
45 lines
1.6 KiB
Plaintext
$NetBSD: patch-bb,v 1.6 2014/05/07 18:44:28 wiz Exp $
|
|
|
|
Support NetBSD and DragonFlyBSD.
|
|
https://bugs.xine-project.org/show_bug.cgi?id=515
|
|
|
|
The CPPFunction typedef (among others) have been deprecated in favour of
|
|
specific prototyped typedefs since readline 4.2.
|
|
They've been working since because compatibility typedefs have been
|
|
until they were removed in readline 6.3.
|
|
Hint found here: https://bugs.gentoo.org/show_bug.cgi?id=504208
|
|
Reported upstream at:
|
|
https://bugs.xine-project.org/show_bug.cgi?id=516
|
|
|
|
--- src/xitk/network.c.orig 2011-11-08 20:49:07.000000000 +0000
|
|
+++ src/xitk/network.c
|
|
@@ -24,7 +24,7 @@
|
|
/* required for getsubopt(); the __sun test avoids compilation problems on
|
|
solaris. On FreeBSD defining this disable BSD functions to be visible
|
|
and remove INADDR_NONE */
|
|
-#if ! defined (__sun__) && ! defined (__OpenBSD__) && ! defined(__FreeBSD__) && ! defined(__APPLE__)
|
|
+#if ! defined (__sun__) && ! defined (__OpenBSD__) && ! defined(__FreeBSD__) && ! defined(__NetBSD__) && ! defined(__APPLE__) && ! defined (__DragonFly__)
|
|
#define _XOPEN_SOURCE 500
|
|
#endif
|
|
/* required for strncasecmp() */
|
|
@@ -64,8 +64,8 @@
|
|
#include <netdb.h>
|
|
#include <pthread.h>
|
|
|
|
-#include <readline.h>
|
|
-#include <history.h>
|
|
+#include <readline/readline.h>
|
|
+#include <readline/history.h>
|
|
|
|
#include "common.h"
|
|
|
|
@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
|
|
rl_readline_name = PROGNAME;
|
|
rl_set_prompt(session.prompt);
|
|
rl_initialize();
|
|
- rl_attempted_completion_function = (CPPFunction *)completion_function;
|
|
+ rl_attempted_completion_function = (rl_completion_func_t *)completion_function;
|
|
|
|
signal(SIGPIPE, SIG_IGN);
|
|
|