diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-09 03:53:05 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-09 03:53:05 -0700 |
| commit | b9c5ce8083be53ea017bd15a63b173b4476fff23 (patch) | |
| tree | 126c38cccb858c291ad9143ca88adb9444891c79 | |
| parent | 30e9ec91107791835d722f99498d659dec048922 (diff) | |
scanpci: Build fix for systems without <err.h>
https://bugs.freedesktop.org/show_bug.cgi?id=31133
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | scanpci/scanpci.c | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 476a4bf..d622961 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,8 @@ AM_CONDITIONAL(GNU, [test "x$gnu" = xyes]) AC_SYS_LARGEFILE +AC_CHECK_HEADERS([err.h]) + AC_CHECK_HEADER([asm/mtrr.h], [have_mtrr_h="yes"], [have_mtrr_h="no"]) if test "x$have_mtrr_h" = xyes; then diff --git a/scanpci/scanpci.c b/scanpci/scanpci.c index 36ecf04..219c814 100644 --- a/scanpci/scanpci.c +++ b/scanpci/scanpci.c @@ -22,11 +22,29 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <stdio.h> -#include <err.h> #include <unistd.h> +#ifdef HAVE_ERR_H +#include <err.h> +#else +# include <errno.h> +# include <string.h> +# define err(exitcode, format, args...) \ + errx(exitcode, format ": %s", ## args, strerror(errno)) +# define errx(exitcode, format, args...) \ + { warnx(format, ## args); exit(exitcode); } +# define warn(format, args...) \ + warnx(format ": %s", ## args, strerror(errno)) +# define warnx(format, args...) \ + fprintf(stderr, format "\n", ## args) +#endif + #include "pciaccess.h" |