diff options
| author | Michael Forney <mforney@mforney.org> | 2020-02-20 21:03:09 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-02-20 21:03:09 -0800 |
| commit | cc0cf73bc04c668321c91e319e463ca01ee9556e (patch) | |
| tree | 204c13181dc719eb30099d78b022100e695f9694 /pkg/iproute2/patch/0013-Use-static-inline-function-for-min.patch | |
| parent | 3502501b404156a146efbe28ee6a787a3856bce3 (diff) | |
iproute2: Remove patch no longer necessary with latest cproc
Diffstat (limited to 'pkg/iproute2/patch/0013-Use-static-inline-function-for-min.patch')
| -rw-r--r-- | pkg/iproute2/patch/0013-Use-static-inline-function-for-min.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/pkg/iproute2/patch/0013-Use-static-inline-function-for-min.patch b/pkg/iproute2/patch/0013-Use-static-inline-function-for-min.patch deleted file mode 100644 index 88f117c2..00000000 --- a/pkg/iproute2/patch/0013-Use-static-inline-function-for-min.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6d637159a5d439f45e4e5574f6f267a7d258daae Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 24 Jun 2019 17:38:56 -0700 -Subject: [PATCH] Use static inline function for min() - -It is only called to calculate a minimum `int`, so specialize for -`int`. ---- - include/utils.h | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/include/utils.h b/include/utils.h -index 001491a1..3e4bd02e 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -272,13 +272,10 @@ unsigned int print_name_and_link(const char *fmt, - # define offsetof(type, member) ((size_t) &((type *)0)->member) - #endif - --#ifndef min --# define min(x, y) ({ \ -- typeof(x) _min1 = (x); \ -- typeof(y) _min2 = (y); \ -- (void) (&_min1 == &_min2); \ -- _min1 < _min2 ? _min1 : _min2; }) --#endif -+static inline int min(int a, int b) -+{ -+ return a < b ? a : b; -+} - - #ifndef __check_format_string - # define __check_format_string(pos_str, pos_args) \ --- -2.25.0 - |
