merge renderproto 0.9.3 back in
This commit is contained in:
parent
02d60a141f
commit
ee276b496d
20
proto/renderproto/configure
vendored
20
proto/renderproto/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for RenderProto 0.9.2.
|
||||
# Generated by GNU Autoconf 2.59 for RenderProto 0.9.3.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='RenderProto'
|
||||
PACKAGE_TARNAME='renderproto'
|
||||
PACKAGE_VERSION='0.9.2'
|
||||
PACKAGE_STRING='RenderProto 0.9.2'
|
||||
PACKAGE_VERSION='0.9.3'
|
||||
PACKAGE_STRING='RenderProto 0.9.3'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS'
|
||||
@ -722,7 +722,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures RenderProto 0.9.2 to adapt to many kinds of systems.
|
||||
\`configure' configures RenderProto 0.9.3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -784,7 +784,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of RenderProto 0.9.2:";;
|
||||
short | recursive ) echo "Configuration of RenderProto 0.9.3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -890,7 +890,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
RenderProto configure 0.9.2
|
||||
RenderProto configure 0.9.3
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@ -904,7 +904,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by RenderProto $as_me 0.9.2, which was
|
||||
It was created by RenderProto $as_me 0.9.3, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -1547,7 +1547,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='renderproto'
|
||||
VERSION='0.9.2'
|
||||
VERSION='0.9.3'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -2112,7 +2112,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by RenderProto $as_me 0.9.2, which was
|
||||
This file was extended by RenderProto $as_me 0.9.3, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -2167,7 +2167,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
RenderProto config.status 0.9.2
|
||||
RenderProto config.status 0.9.3
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT([RenderProto], [0.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
|
||||
AC_INIT([RenderProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
|
@ -26,10 +26,10 @@
|
||||
#ifndef _RENDER_H_
|
||||
#define _RENDER_H_
|
||||
|
||||
typedef unsigned long Glyph;
|
||||
typedef unsigned long GlyphSet;
|
||||
typedef unsigned long Picture;
|
||||
typedef unsigned long PictFormat;
|
||||
typedef XID Glyph;
|
||||
typedef XID GlyphSet;
|
||||
typedef XID Picture;
|
||||
typedef XID PictFormat;
|
||||
|
||||
#define RENDER_NAME "RENDER"
|
||||
#define RENDER_MAJOR 0
|
||||
|
@ -46,7 +46,6 @@
|
||||
#define PictFormat CARD32
|
||||
#define Fixed INT32
|
||||
#define Glyphset CARD32
|
||||
#define Glyph CARD32
|
||||
|
||||
/*
|
||||
* data structures
|
||||
@ -660,6 +659,5 @@ typedef struct {
|
||||
#undef PictFormat
|
||||
#undef Fixed
|
||||
#undef Glyphset
|
||||
#undef Glyph
|
||||
|
||||
#endif /* _XRENDERP_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user