diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-08-10 13:40:17 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-08-10 13:40:17 -0700 |
| commit | fc788dc35532ebff44b5828f686b42e0deeec52c (patch) | |
| tree | 42a4fb1c0973c627cfca5b0ad757bc17c89874cb | |
| parent | b9860eeb000018a83233cec14ff0db8687a146b5 (diff) | |
Convert old #ifdefs for HAS_WTYPE_H & HAS_WCHAR_H to autoconf checks
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xprop.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 70f7852..2d6d100 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,8 @@ XORG_MACROS_VERSION(1.1) AC_PROG_CC AC_PROG_INSTALL +AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) + # Checks for pkg-config packages PKG_CHECK_MODULES(XPROP, xmuu x11) AC_SUBST(XPROP_CFLAGS) @@ -29,6 +29,7 @@ from The Open Group. */ /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */ +#include "config.h" #include <X11/Xlib.h> #include <X11/Xos.h> @@ -37,15 +38,15 @@ from The Open Group. #include <stdlib.h> #include <stdio.h> #include <ctype.h> -#ifdef HAS_WCHAR_H +#ifdef HAVE_WCHAR_H #include <wchar.h> #endif -#ifdef HAS_WCTYPE_H +#ifdef HAVE_WCTYPE_H #include <wctype.h> #endif #include <locale.h> -#ifndef HAS_WCTYPE_H +#ifndef HAVE_WCTYPE_H #define iswprint(x) isprint(x) #endif |