[PATCH 0/3] recordproto/libXtst Xlib headers cleanup

[Peter Hutterer]

On Tue, Aug 18, 2009 at 08:23:29AM -0700, Dan Nicholson wrote:
> On Mon, Aug 17, 2009 at 6:13 PM, Peter Hutterer<peter.hutterer at who-t.net> wrote:
> > On Mon, Aug 17, 2009 at 11:00:29PM +0200, Guillem Jover wrote:
> >> On Mon, 2009-08-17 at 13:49:40 +1000, Peter Hutterer wrote:
> >> > recordproto is bumped to a preliminary 1.1 release, I decided not to rename
> >> > recortstr.h to recordproto.h to leave clients completely unaffected.
> >>
> >> What about renaming it and providing a recortstr.h that looks
> >> something like:
> >>
> >> #warning "Obsolete header, include <X11/extensions/recordproto.h> instead."
> >> #include <X11/extensions/recordproto.h>
> >
> > sounds good to me. something like this?
> >
> >
> > From 07f625238dc9675cce995837e04ff4020216cf1a Mon Sep 17 00:00:00 2001
> > From: Peter Hutterer <peter.hutterer at who-t.net>
> > Date: Tue, 18 Aug 2009 11:08:27 +1000
> > Subject: [PATCH] Rename recordstr.h to recordproto.h, provide a stub instead.
> >
> > Renaming for consistency with other protocol packages. recordstr.h is a
> > simple stub warning against the use of this header.
> >
> > Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> > ---
> >  Makefile.am   |    1 +
> >  recordproto.h |  306 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  recordstr.h   |  310 +--------------------------------------------------------
> >  3 files changed, 311 insertions(+), 306 deletions(-)
> >  create mode 100644 recordproto.h
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index 28950ee..dd0b028 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -1,6 +1,7 @@
> >  recorddir = $(includedir)/X11/extensions
> >  record_HEADERS = \
> >        recordconst.h \
> > +       recordproto.h \
> >        recordstr.h
> >
> >  pkgconfigdir = $(libdir)/pkgconfig
> > diff --git a/recordproto.h b/recordproto.h
> > new file mode 100644
> > index 0000000..b9d2382
> > --- /dev/null
> > +++ b/recordproto.h
> > @@ -0,0 +1,306 @@
> > +/***************************************************************************
> > + * Copyright 1995 Network Computing Devices
> > + *
> > + * Permission to use, copy, modify, distribute, and sell this software and
> > + * its documentation for any purpose is hereby granted without fee, provided
> > + * that the above copyright notice appear in all copies and that both that
> > + * copyright notice and this permission notice appear in supporting
> > + * documentation, and that the name of Network Computing Devices
> > + * not be used in advertising or publicity pertaining to distribution
> > + * of the software without specific, written prior permission.
> > + *
> > + * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
> > + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> > + * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE
> > + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> > + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
> > + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
> > + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> > + **************************************************************************/
> > +
> > +#ifndef _RECORDSTR_H_
> > +#define _RECORDSTR_H_
> 
> Not terribly important, but maybe you want to rename the header guards.

thanks, squashed in.

Cheers,
  Peter