diff options
| author | matt <matt@matt-laptop.(none)> | 2011-04-14 21:56:56 -0600 |
|---|---|---|
| committer | matt <matt@matt-laptop.(none)> | 2011-04-14 21:56:56 -0600 |
| commit | 50d11565a012cf9838c26728f3fae47e52c4efc4 (patch) | |
| tree | c75e160c385f3e631b07a87837baa0efb7ccfd6f | |
| parent | 8332e65b816a9bd958c08e57eb6d9789a5b9ac0b (diff) | |
| parent | c1c91e9a221a0e762d96cc12a3f189d6e59f4865 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/lib/libX11
| -rw-r--r-- | modules/im/ximcp/imRmAttr.c | 4 | ||||
| -rw-r--r-- | specs/i18n/framework/Makefile.am | 4 | ||||
| -rw-r--r-- | specs/i18n/localedb/Makefile.am | 4 | ||||
| -rw-r--r-- | specs/i18n/trans/Makefile.am | 4 | ||||
| -rw-r--r-- | specs/libX11/Makefile.am | 2 |
5 files changed, 6 insertions, 12 deletions
diff --git a/modules/im/ximcp/imRmAttr.c b/modules/im/ximcp/imRmAttr.c index 5035df5..7503905 100644 --- a/modules/im/ximcp/imRmAttr.c +++ b/modules/im/ximcp/imRmAttr.c @@ -1384,7 +1384,7 @@ _XimCountNumberOfAttr( { unsigned int n; INT16 len; - INT16 min_len = sizeof(CARD16) /* sizeof attrinute ID */ + INT16 min_len = sizeof(CARD16) /* sizeof attribute ID */ + sizeof(CARD16) /* sizeof type of value */ + sizeof(INT16); /* sizeof length of attribute */ @@ -1417,7 +1417,7 @@ _XimGetAttributeID( int values_len; register int i; INT16 len; - INT16 min_len = sizeof(CARD16) /* sizeof attrinute ID */ + INT16 min_len = sizeof(CARD16) /* sizeof attribute ID */ + sizeof(CARD16) /* sizeof type of value */ + sizeof(INT16); /* sizeof length of attr */ /* diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am index 6e8b010..af7ae1d 100644 --- a/specs/i18n/framework/Makefile.am +++ b/specs/i18n/framework/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = framework.xml @@ -9,10 +8,9 @@ docbook = framework.xml chapters = framework.svg # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/framework +shelfdir = $(docdir)/i18n/framework # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am index 8db6a7b..68a917c 100644 --- a/specs/i18n/localedb/Makefile.am +++ b/specs/i18n/localedb/Makefile.am @@ -1,15 +1,13 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = localedb.xml # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/localedb +shelfdir = $(docdir)/i18n/localedb # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am index cdec750..40a135a 100644 --- a/specs/i18n/trans/Makefile.am +++ b/specs/i18n/trans/Makefile.am @@ -1,15 +1,13 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = trans.xml # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/trans +shelfdir = $(docdir)/i18n/trans # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am index c4de67e..b87e568 100644 --- a/specs/libX11/Makefile.am +++ b/specs/libX11/Makefile.am @@ -30,7 +30,7 @@ chapters = \ glossary.xml # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir) +shelfdir = $(docdir)/libX11 # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am |