Merge branch 'release/external-1.17.0.0-x' into release/1.17.0.0-x

2 files changed, 126 insertions, 117 deletions

diff --git a/libXfont/src/fc/Makefile.in b/libXfont/src/fc/Makefile.in
index 5200ab7e6..a3e671f86 100644
--- a/libXfont/src/fc/Makefile.in
+++ b/libXfont/src/fc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -79,12 +89,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/fc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h \
 	$(top_builddir)/include/X11/fonts/fontconf.h
@@ -158,6 +167,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -339,7 +349,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign src/fc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -613,6 +622,8 @@ uninstall-am:
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libXfont/src/fc/fslibos.h b/libXfont/src/fc/fslibos.h
index c1f0eded2..1ef362dfc 100644
--- a/libXfont/src/fc/fslibos.h
+++ b/libXfont/src/fc/fslibos.h
@@ -43,176 +43,174 @@ from The Open Group.
  * makedepend screws up on #undef OPEN_MAX, so we define a new symbol
  */
 
-#ifndef FONT_OPEN_MAX
-
-#ifndef X_NOT_POSIX
-# ifdef _POSIX_SOURCE
-#  include <limits.h>
-# else
-#  define _POSIX_SOURCE
-#  include <limits.h>
-#  undef _POSIX_SOURCE
-# endif
-#endif
-#ifndef SIZE_MAX
-# ifdef ULONG_MAX
-#  define SIZE_MAX ULONG_MAX
+# ifndef FONT_OPEN_MAX
+
+#  ifdef _POSIX_SOURCE
+#   include <limits.h>
+#  else
+#   define _POSIX_SOURCE
+#   include <limits.h>
+#   undef _POSIX_SOURCE
+#  endif
+#  ifndef SIZE_MAX
+#   ifdef ULONG_MAX
+#    define SIZE_MAX ULONG_MAX
+#   else
+#    define SIZE_MAX UINT_MAX
+#   endif
+#  endif
+#  ifndef OPEN_MAX
+#   if defined(SVR4)
+#    define OPEN_MAX 256
+#   else
+#    include <sys/param.h>
+#    ifndef OPEN_MAX
+#     ifdef __OSF1__
+#      define OPEN_MAX 256
+#     else
+#      ifdef NOFILE
+#       define OPEN_MAX NOFILE
+#      else
+#       define OPEN_MAX NOFILES_MAX
+#      endif
+#     endif
+#    endif
+#   endif
+#  endif
+
+#  if OPEN_MAX > 256
+#   define FONT_OPEN_MAX 256
+#  else
+#   define FONT_OPEN_MAX OPEN_MAX
+#  endif
+
+# endif /* FONT_OPEN_MAX */
+
+# ifdef WORD64
+#  define NMSKBITS 64
 # else
-#  define SIZE_MAX UINT_MAX
+#  define NMSKBITS 32
 # endif
-#endif
-#ifndef OPEN_MAX
-#if defined(SVR4)
-#define OPEN_MAX 256
-#else
-#include <sys/param.h>
-#ifndef OPEN_MAX
-#ifdef __OSF1__
-#define OPEN_MAX 256
-#else
-#ifdef NOFILE
-#define OPEN_MAX NOFILE
-#else
-#define OPEN_MAX NOFILES_MAX
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#if OPEN_MAX > 256
-#define FONT_OPEN_MAX 256
-#else
-#define FONT_OPEN_MAX OPEN_MAX
-#endif
-
-#endif /* FONT_OPEN_MAX */
-
-#ifdef WORD64
-#define NMSKBITS 64
-#else
-#define NMSKBITS 32
-#endif
 
-#define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS)
+# define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS)
 
 typedef unsigned long FdSet[MSKCNT];
 typedef FdSet FdSetPtr;
 
-#if (MSKCNT==1)
-#define BITMASK(i) (1 << (i))
-#define MASKIDX(i) 0
-#endif
+# if (MSKCNT==1)
+#  define BITMASK(i) (1 << (i))
+#  define MASKIDX(i) 0
+# endif
 
-#if (MSKCNT>1)
-#define BITMASK(i) (1 << ((i) & (NMSKBITS - 1)))
-#define MASKIDX(i) ((i) / NMSKBITS)
-#endif
+# if (MSKCNT>1)
+#  define BITMASK(i) (1 << ((i) & (NMSKBITS - 1)))
+#  define MASKIDX(i) ((i) / NMSKBITS)
+# endif
 
-#define MASKWORD(buf, i) buf[MASKIDX(i)]
-#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)
-#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
-#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
-
-#if (MSKCNT==1)
-#define COPYBITS(src, dst) dst[0] = src[0]
-#define CLEARBITS(buf) buf[0] = 0
-#define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0])
-#define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0])
-#define UNSETBITS(dst, b1) (dst[0] &= ~b1[0])
-#define ANYSET(src) (src[0])
-#endif
+# define MASKWORD(buf, i) buf[MASKIDX(i)]
+# define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)
+# define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
+# define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
+
+# if (MSKCNT==1)
+#  define COPYBITS(src, dst) dst[0] = src[0]
+#  define CLEARBITS(buf) buf[0] = 0
+#  define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0])
+#  define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0])
+#  define UNSETBITS(dst, b1) (dst[0] &= ~b1[0])
+#  define ANYSET(src) (src[0])
+# endif
 
-#if (MSKCNT==2)
-#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; }
-#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; }
-#define MASKANDSETBITS(dst, b1, b2)  {\
+# if (MSKCNT==2)
+#  define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; }
+#  define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; }
+#  define MASKANDSETBITS(dst, b1, b2)  {\
 		      dst[0] = (b1[0] & b2[0]);\
 		      dst[1] = (b1[1] & b2[1]); }
-#define ORBITS(dst, b1, b2)  {\
+#  define ORBITS(dst, b1, b2)  {\
 		      dst[0] = (b1[0] | b2[0]);\
 		      dst[1] = (b1[1] | b2[1]); }
-#define UNSETBITS(dst, b1) {\
+#  define UNSETBITS(dst, b1) {\
                       dst[0] &= ~b1[0]; \
                       dst[1] &= ~b1[1]; }
-#define ANYSET(src) (src[0] || src[1])
-#endif
+#  define ANYSET(src) (src[0] || src[1])
+# endif
 
-#if (MSKCNT==3)
-#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \
+# if (MSKCNT==3)
+#  define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \
 			     dst[2] = src[2]; }
-#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; }
-#define MASKANDSETBITS(dst, b1, b2)  {\
+#  define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; }
+#  define MASKANDSETBITS(dst, b1, b2)  {\
 		      dst[0] = (b1[0] & b2[0]);\
 		      dst[1] = (b1[1] & b2[1]);\
 		      dst[2] = (b1[2] & b2[2]); }
-#define ORBITS(dst, b1, b2)  {\
+#  define ORBITS(dst, b1, b2)  {\
 		      dst[0] = (b1[0] | b2[0]);\
 		      dst[1] = (b1[1] | b2[1]);\
 		      dst[2] = (b1[2] | b2[2]); }
-#define UNSETBITS(dst, b1) {\
+#  define UNSETBITS(dst, b1) {\
                       dst[0] &= ~b1[0]; \
                       dst[1] &= ~b1[1]; \
                       dst[2] &= ~b1[2]; }
-#define ANYSET(src) (src[0] || src[1] || src[2])
-#endif
+#  define ANYSET(src) (src[0] || src[1] || src[2])
+# endif
 
-#if (MSKCNT==4)
-#define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \
+# if (MSKCNT==4)
+#  define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \
 			   dst[2] = src[2]; dst[3] = src[3]
-#define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0
-#define MASKANDSETBITS(dst, b1, b2)  \
+#  define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0
+#  define MASKANDSETBITS(dst, b1, b2)  \
                       dst[0] = (b1[0] & b2[0]);\
                       dst[1] = (b1[1] & b2[1]);\
                       dst[2] = (b1[2] & b2[2]);\
                       dst[3] = (b1[3] & b2[3])
-#define ORBITS(dst, b1, b2)  \
+#  define ORBITS(dst, b1, b2)  \
                       dst[0] = (b1[0] | b2[0]);\
                       dst[1] = (b1[1] | b2[1]);\
                       dst[2] = (b1[2] | b2[2]);\
                       dst[3] = (b1[3] | b2[3])
-#define UNSETBITS(dst, b1) \
+#  define UNSETBITS(dst, b1) \
                       dst[0] &= ~b1[0]; \
                       dst[1] &= ~b1[1]; \
                       dst[2] &= ~b1[2]; \
                       dst[3] &= ~b1[3]
-#define ANYSET(src) (src[0] || src[1] || src[2] || src[3])
-#endif
+#  define ANYSET(src) (src[0] || src[1] || src[2] || src[3])
+# endif
 
-#if (MSKCNT>4)
-#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src,\
+# if (MSKCNT>4)
+#  define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src,\
 				   MSKCNT*sizeof(long))
-#define CLEARBITS(buf) bzero((caddr_t) buf, MSKCNT*sizeof(long))
-#define MASKANDSETBITS(dst, b1, b2)  \
+#  define CLEARBITS(buf) bzero((caddr_t) buf, MSKCNT*sizeof(long))
+#  define MASKANDSETBITS(dst, b1, b2)  \
 		      { int cri;			\
 			for (cri=MSKCNT; --cri>=0; )	\
 		          dst[cri] = (b1[cri] & b2[cri]); }
-#define ORBITS(dst, b1, b2)  \
+#  define ORBITS(dst, b1, b2)  \
 		      { int cri;			\
 		      for (cri=MSKCNT; --cri>=0; )	\
 		          dst[cri] = (b1[cri] | b2[cri]); }
-#define UNSETBITS(dst, b1) \
+#  define UNSETBITS(dst, b1) \
 		      { int cri;			\
 		      for (cri=MSKCNT; --cri>=0; )	\
 		          dst[cri] &= ~b1[cri];  }
-#if (MSKCNT==8)
-#define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || \
+#  if (MSKCNT==8)
+#   define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || \
 		     src[4] || src[5] || src[6] || src[7])
-#endif
-#endif
+#  endif
+# endif
 
 #else /* not WIN32 */
 
-#include <X11/Xwinsock.h>
-#include <X11/Xw32defs.h>
+# include <X11/Xwinsock.h>
+# include <X11/Xw32defs.h>
 
 typedef fd_set FdSet;
 typedef FdSet *FdSetPtr;
 
-#define CLEARBITS(set) FD_ZERO(&set)
-#define BITSET(set,s) FD_SET(s,&set)
-#define BITCLEAR(set,s) FD_CLR(s,&set)
-#define GETBIT(set,s) FD_ISSET(s,&set)
-#define ANYSET(set) set->fd_count
+# define CLEARBITS(set) FD_ZERO(&set)
+# define BITSET(set,s) FD_SET(s,&set)
+# define BITCLEAR(set,s) FD_CLR(s,&set)
+# define GETBIT(set,s) FD_ISSET(s,&set)
+# define ANYSET(set) set->fd_count
 
 #endif