summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-process/procps/files/procps-3.3.8-no-error_h.patch')
-rw-r--r--sys-process/procps/files/procps-3.3.8-no-error_h.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/sys-process/procps/files/procps-3.3.8-no-error_h.patch b/sys-process/procps/files/procps-3.3.8-no-error_h.patch
deleted file mode 100644
index e6ca7937..00000000
--- a/sys-process/procps/files/procps-3.3.8-no-error_h.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur procps-ng-3.3.8.orig/ps/display.c procps-ng-3.3.8/ps/display.c
---- procps-ng-3.3.8.orig/ps/display.c 2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/display.c 2014-01-17 14:43:26.027950754 +0000
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
- case SIGUSR2:
- exit(EXIT_FAILURE);
- default:
-+#if HAVE_ERROR_H
- error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+ err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
- signal(signo, SIG_DFL); /* allow core file creation */
- kill(getpid(), signo);
- }
---- procps-ng-3.3.8.orig/ps/global.c 2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/global.c 2014-01-17 14:42:00.972945998 +0000
-@@ -25,7 +27,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +529,10 @@
- unsigned int linenum,
- const char *message)
- {
-+#if HAVE_ERROR_H
- error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+ err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
- exit(EXIT_FAILURE);
- }