Use XKB alloc macros internally

These are used throughout the XKB code, but are defined in XKBsrv.h,
which we'd like to avoid. Internal definitions for True/False have also
been added since they're in Xlib.h
master
Dan Nicholson 2009-03-19 15:10:14 -07:00
parent 6aa78dedb2
commit d4ddac2b8d
3 changed files with 61 additions and 1 deletions

View File

@ -72,6 +72,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros before running autoconf/autogen.sh])]) [m4_fatal([must install xorg-macros before running autoconf/autogen.sh])])
XORG_MACROS_VERSION([1.2.0]) XORG_MACROS_VERSION([1.2.0])
XORG_RELEASE_VERSION XORG_RELEASE_VERSION
XORG_CHECK_MALLOC_ZERO
XORG_CWARNFLAGS XORG_CWARNFLAGS
XORG_CHANGELOG XORG_CHANGELOG

View File

@ -1,7 +1,7 @@
SUBDIRS = makekeys SUBDIRS = makekeys
INCLUDES = -I$(top_srcdir)/include INCLUDES = -I$(top_srcdir)/include
AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) AM_CFLAGS = $(X11_CFLAGS) $(CWARNFLAGS) $(XMALLOC_ZERO_CFLAGS)
BUILT_SOURCES = ks_tables.h BUILT_SOURCES = ks_tables.h
ks_tables.h: $(builddir)/makekeys/makekeys$(EXEEXT) ks_tables.h: $(builddir)/makekeys/makekeys$(EXEEXT)
@ -14,5 +14,6 @@ $(builddir)/makekeys/makekeys$(EXEEXT):
lib_LTLIBRARIES = libxkbcommon.la lib_LTLIBRARIES = libxkbcommon.la
libxkbcommon_la_SOURCES = \ libxkbcommon_la_SOURCES = \
XkbCommonInt.h \
ks_tables.h \ ks_tables.h \
keysym.c keysym.c

58
src/XkbCommonInt.h Normal file
View File

@ -0,0 +1,58 @@
/*
Copyright 2008 Dan Nicholson
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the names of the authors or their
institutions shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the authors.
*/
#ifndef _XKBCOMMONINT_H_
#define _XKBCOMMONINT_H_
#include <stdlib.h>
#include <string.h>
#ifndef True
#define True 1
#define False 0
#endif
#ifdef MALLOC_0_RETURNS_NULL
# define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))
# define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))
# define Xcalloc(nelem, elsize) calloc(((nelem) == 0 ? 1 : (nelem)), (elsize))
#else
# define Xmalloc(size) malloc((size))
# define Xrealloc(ptr, size) realloc((ptr), (size))
# define Xcalloc(nelem, elsize) calloc((nelem), (elsize))
#endif
#define _XkbAlloc(s) Xmalloc((s))
#define _XkbCalloc(n,s) Xcalloc((n),(s))
#define _XkbRealloc(o,s) Xrealloc((o),(s))
#define _XkbTypedAlloc(t) ((t *)Xmalloc(sizeof(t)))
#define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n),sizeof(t)))
#define _XkbTypedRealloc(o,n,t) \
((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
#define _XkbFree(p) free((p))
#endif /* _XKBCOMMONINT_H_ */