svn merge ^/branches/released .

1 files changed, 87 insertions, 89 deletions

diff --git a/libxkbfile/src/XKBfileInt.h b/libxkbfile/src/XKBfileInt.h
index 22083fa46..80dfde295 100644
--- a/libxkbfile/src/XKBfileInt.h
+++ b/libxkbfile/src/XKBfileInt.h
@@ -1,89 +1,87 @@
-#ifndef _XKBFILEINT_H_
-#define	_XKBFILEINT_H_ 1
-
-/* $Xorg: XKBfileInt.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, 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 Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS 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.
-
- ********************************************************/
-/* $XFree86$ */
-
-#include "XKBfile.h"
-#include <string.h>
-
-#ifdef DEBUG
-#define	_XkbLibError(c,l,d) \
-	{ fprintf(stderr,"xkbfile: %s in %s\n",_XkbErrMessages[c],(l)); \
-	 _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
-#else
-#define	_XkbLibError(c,l,d) \
-	{ _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
-#endif
-
-#ifndef XKB_IN_SERVER
-
-#define	_XkbAlloc(s)		malloc((s))
-#define	_XkbCalloc(n,s)		calloc((n),(s))
-#define	_XkbRealloc(o,s)	realloc((o),(s))
-#define	_XkbTypedAlloc(t)	((t *)malloc(sizeof(t)))
-#define	_XkbTypedCalloc(n,t)	((t *)calloc((n),sizeof(t)))
-#define	_XkbTypedRealloc(o,n,t) \
-	((o)?(t *)realloc((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)
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-
-#endif
-
-#include <unistd.h>
-#ifdef _MSC_VER
-#define inline __inline
-#endif
-
-_XFUNCPROTOBEGIN
-
-static inline
-char *_XkbDupString(const char *s)
-{
-    return s ? strdup(s) : NULL;
-}
-
-#define _XkbStrCaseEqual(s1,s2)	(_XkbStrCaseCmp(s1,s2)==0)
-
-#ifdef NEED_STRCASECMP
-extern int _XkbStrCaseCmp(char *s1, char *s2);
-#else
-#define _XkbStrCaseCmp strcasecmp
-#endif
-
-_XFUNCPROTOEND
-
-#endif /* _XKBFILEINT_H_ */
+#ifndef _XKBFILEINT_H_

+#define	_XKBFILEINT_H_ 1

+

+/************************************************************

+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.

+

+ Permission to use, copy, modify, and distribute this

+ software and its documentation for any purpose and without

+ fee is hereby granted, 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 Silicon Graphics not be 

+ used in advertising or publicity pertaining to distribution 

+ of the software without specific prior written permission.

+ Silicon Graphics makes no representation about the suitability 

+ of this software for any purpose. It is provided "as is"

+ without any express or implied warranty.

+ 

+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

+ GRAPHICS 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.

+

+ ********************************************************/

+

+#include "XKBfile.h"

+#include <string.h>

+

+#ifdef DEBUG

+#define	_XkbLibError(c,l,d) \

+	{ fprintf(stderr,"xkbfile: %s in %s\n",_XkbErrMessages[c],(l)); \

+	 _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }

+#else

+#define	_XkbLibError(c,l,d) \

+	{ _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }

+#endif

+

+#ifndef XKB_IN_SERVER

+

+#define	_XkbAlloc(s)		malloc((s))

+#define	_XkbCalloc(n,s)		calloc((n),(s))

+#define	_XkbRealloc(o,s)	realloc((o),(s))

+#define	_XkbTypedAlloc(t)	((t *)malloc(sizeof(t)))

+#define	_XkbTypedCalloc(n,t)	((t *)calloc((n),sizeof(t)))

+#define	_XkbTypedRealloc(o,n,t) \

+	((o)?(t *)realloc((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)

+

+#ifndef PATH_MAX

+#ifdef MAXPATHLEN

+#define PATH_MAX MAXPATHLEN

+#else

+#define PATH_MAX 1024

+#endif

+#endif

+

+#endif

+

+#include <unistd.h>

+#ifdef _MSC_VER

+#define inline __inline

+#endif

+

+_XFUNCPROTOBEGIN

+

+static inline

+char *_XkbDupString(const char *s)

+{

+    return s ? strdup(s) : NULL;

+}

+

+#define _XkbStrCaseEqual(s1,s2)	(_XkbStrCaseCmp(s1,s2)==0)

+

+#ifdef NEED_STRCASECMP

+extern int _XkbStrCaseCmp(char *s1, char *s2);

+#else

+#define _XkbStrCaseCmp strcasecmp

+#endif

+

+_XFUNCPROTOEND

+

+#endif /* _XKBFILEINT_H_ */