Module Name: xsrc
Committed By: mrg
Date: Sat Aug 22 01:04:32 UTC 2009
Modified Files:
xsrc/external/mit/xkbcomp/dist: utils.h
xsrc/external/mit/xrandr/dist: xrandr.c
Added Files:
xsrc/external/mit/xkbcomp/include: config.h
Log Message:
use some more #ifdef HAVE_CONFIG_H.
give xkbcomp a config.h, it seems to demand one now...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/xkbcomp/dist/utils.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xkbcomp/include/config.h
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xrandr/dist/xrandr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xkbcomp/dist/utils.h
diff -u xsrc/external/mit/xkbcomp/dist/utils.h:1.1.1.2 xsrc/external/mit/xkbcomp/dist/utils.h:1.2
--- xsrc/external/mit/xkbcomp/dist/utils.h:1.1.1.2 Fri Aug 21 23:38:33 2009
+++ xsrc/external/mit/xkbcomp/dist/utils.h Sat Aug 22 01:04:32 2009
@@ -35,7 +35,9 @@
#include <X11/Xfuncs.h>
#include <stddef.h>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#ifndef NUL
#define NUL '\0'
Index: xsrc/external/mit/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.1.1.3 xsrc/external/mit/xrandr/dist/xrandr.c:1.2
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.1.1.3 Fri Aug 21 23:38:38 2009
+++ xsrc/external/mit/xrandr/dist/xrandr.c Sat Aug 22 01:04:32 2009
@@ -37,7 +37,9 @@
#include <stdarg.h>
#include <math.h>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#if RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 2)
#define HAS_RANDR_1_2 1
Added files:
Index: xsrc/external/mit/xkbcomp/include/config.h
diff -u /dev/null xsrc/external/mit/xkbcomp/include/config.h:1.1
--- /dev/null Sat Aug 22 01:04:32 2009
+++ xsrc/external/mit/xkbcomp/include/config.h Sat Aug 22 01:04:32 2009
@@ -0,0 +1,68 @@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "xkbcomp"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg";
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "xkbcomp"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "xkbcomp 1.1.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "xkbcomp"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.1.0"
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 1
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 1
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 0
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.1.0"
