1 rename err() function to avoid clashing with err() form C library
3 err() is a function available in the C library, so when static linking,
4 there is a clash at link timebecause the function is provided both by
6 http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log
8 Fix that by renaming err() to nbd_err() and providing a small maco
9 wrapper to avoid touching the many call sites.
11 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
14 Upstream status: hack, not submitted.
16 diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h
17 --- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200
18 +++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200
20 void setmysockopt(int sock);
21 void err_nonfatal(const char *s);
23 -void err(const char *s) G_GNUC_NORETURN;
24 +void nbd_err(const char *s) G_GNUC_NORETURN;
25 +#define err(S) nbd_err(S)
27 void logging(const char* name);