diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-06-01 14:22:10 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-06-01 14:22:10 +0000 |
| commit | fd257896fe634f8fabb4ba0cde2bf71e0c9fb698 (patch) | |
| tree | e184c24838bd3ba4349348f3cf16438c150ae6c1 /lib/libXrandr/src | |
| parent | d5ced1b2331b1be344b912d46c2cf8eb16f39b76 (diff) | |
Update to libXrandr 1.4.1
Diffstat (limited to 'lib/libXrandr/src')
| -rw-r--r-- | lib/libXrandr/src/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/libXrandr/src/Makefile.in | 11 | ||||
| -rw-r--r-- | lib/libXrandr/src/XrrCrtc.c | 2 | ||||
| -rw-r--r-- | lib/libXrandr/src/XrrMode.c | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/lib/libXrandr/src/Makefile.am b/lib/libXrandr/src/Makefile.am index 7a47b9c4b..21138469b 100644 --- a/lib/libXrandr/src/Makefile.am +++ b/lib/libXrandr/src/Makefile.am @@ -19,7 +19,7 @@ AM_CFLAGS = \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) -INCLUDES = -I$(top_srcdir)/include/X11/extensions +AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined diff --git a/lib/libXrandr/src/Makefile.in b/lib/libXrandr/src/Makefile.in index a03b414c4..5072bf20f 100644 --- a/lib/libXrandr/src/Makefile.in +++ b/lib/libXrandr/src/Makefile.in @@ -202,7 +202,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -225,6 +224,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANDR_CFLAGS = @RANDR_CFLAGS@ RANDR_LIBS = @RANDR_LIBS@ RANDR_VERSION = @RANDR_VERSION@ @@ -309,7 +310,7 @@ AM_CFLAGS = \ $(MALLOC_ZERO_CFLAGS) \ $(CWARNFLAGS) -INCLUDES = -I$(top_srcdir)/include/X11/extensions +AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined libXrandrincludedir = $(includedir)/X11/extensions libXrandrinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrandr.h @@ -317,7 +318,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -342,9 +343,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) diff --git a/lib/libXrandr/src/XrrCrtc.c b/lib/libXrandr/src/XrrCrtc.c index 5eac42c86..a704a52e5 100644 --- a/lib/libXrandr/src/XrrCrtc.c +++ b/lib/libXrandr/src/XrrCrtc.c @@ -306,7 +306,7 @@ void XRRSetCrtcTransform (Display *dpy, RRCrtc crtc, XTransform *transform, - char *filter, + _Xconst char *filter, XFixed *params, int nparams) { diff --git a/lib/libXrandr/src/XrrMode.c b/lib/libXrandr/src/XrrMode.c index 0b74a73e4..e605e8aef 100644 --- a/lib/libXrandr/src/XrrMode.c +++ b/lib/libXrandr/src/XrrMode.c @@ -33,7 +33,7 @@ #include "Xrandrint.h" XRRModeInfo * -XRRAllocModeInfo (char *name, int nameLength) +XRRAllocModeInfo (_Xconst char *name, int nameLength) { XRRModeInfo *mode_info; |