diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/development/libraries/libedit | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/libedit')
| -rw-r--r-- | pkgs/development/libraries/libedit/freebsd_weak_ref.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/development/libraries/libedit/freebsd_weak_ref.patch b/pkgs/development/libraries/libedit/freebsd_weak_ref.patch deleted file mode 100644 index a4399593d636..000000000000 --- a/pkgs/development/libraries/libedit/freebsd_weak_ref.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libedit-20110709-3.0/src/vi.c.old 2011-07-11 18:21:16.000000000 +0000 -+++ libedit-20110709-3.0/src/vi.c 2011-07-11 18:24:29.000000000 +0000 -@@ -918,7 +918,7 @@ - * NB: posix implies that we should enter insert mode, however - * this is against historical precedent... - */ --#ifdef __weak_reference -+#if defined(__weak_reference) && defined(__NetBSD__) - __weakref_visible char *my_get_alias_text(const char *) - __weak_reference(get_alias_text); - #endif -@@ -926,7 +926,7 @@ - /*ARGSUSED*/ - vi_alias(EditLine *el, Int c) - { --#ifdef __weak_reference -+#if defined(__weak_reference) && defined(__NetBSD__) - char alias_name[3]; - char *alias_text; - |