xserver: Branch 'master' - 6 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Oct 3 11:50:12 PDT 2011
Xext/xcmisc.c | 5 -----
dbe/dbe.c | 5 -----
dix/.gitignore | 1 +
doc/dtrace/Xserver-DTrace.xml | 22 +++++++++++-----------
include/dix-config.h.in | 3 ---
os/.gitignore | 1 +
render/render.c | 4 ----
7 files changed, 13 insertions(+), 28 deletions(-)
New commits:
commit 9a55b3661b4172f9a32cd6fefb254e06edb1a88a
Merge: cf11ca3... 84bb020...
Author: Keith Packard <keithp at keithp.com>
Date: Mon Oct 3 11:49:23 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit 84bb0207f6db433a8d387d933393357da87ca23e
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Fri Sep 23 20:03:03 2011 -0400
dix and os: gitignore dix.O and os.O
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/dix/.gitignore b/dix/.gitignore
index c1b4f20..65f2f8c 100644
--- a/dix/.gitignore
+++ b/dix/.gitignore
@@ -1,2 +1,3 @@
# Add & Override for this directory and it's subdirectories
Xserver-dtrace.h
+dix.O
diff --git a/os/.gitignore b/os/.gitignore
new file mode 100644
index 0000000..bba633b
--- /dev/null
+++ b/os/.gitignore
@@ -0,0 +1 @@
+os.O
commit 3d41939d0349569dcfd2aef9b846c739d0ba0060
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Thu Sep 22 17:41:38 2011 -0700
Unconditionally #include <stdint.h>
The more recent inclusions of this file haven't been checking for
HAVE_STDINT_H, so might as well make the older ones consistent.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 8e3c9cd..745135e 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -40,12 +40,7 @@ from The Open Group.
#include <X11/extensions/xcmiscproto.h>
#include "modinit.h"
-#if HAVE_STDINT_H
#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
-
static int
ProcXCMiscGetVersion(ClientPtr client)
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 86d8220..a468676 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -38,12 +38,7 @@
#endif
#include <string.h>
-#if HAVE_STDINT_H
#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
-
#include <X11/X.h>
#include <X11/Xproto.h>
#include "scrnintstr.h"
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 5facb11..aa7de60 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -178,9 +178,6 @@
/* Define to 1 if you have the `shmctl64' function. */
#undef HAVE_SHMCTL64
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
diff --git a/render/render.c b/render/render.c
index cc13dbc..ff75409 100644
--- a/render/render.c
+++ b/render/render.c
@@ -52,11 +52,7 @@
#include "panoramiXsrv.h"
#endif
-#if HAVE_STDINT_H
#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
static int ProcRenderQueryVersion (ClientPtr pClient);
static int ProcRenderQueryPictFormats (ClientPtr pClient);
commit 46d5ae5b551cc926331324073f2686b47e8aea07
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Fri Sep 23 09:38:25 2011 -0400
dtrace: fix typo in title
The word provider should be capitalized.
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml
index 2427202..fa8bc80 100644
--- a/doc/dtrace/Xserver-DTrace.xml
+++ b/doc/dtrace/Xserver-DTrace.xml
@@ -6,7 +6,7 @@
<article id="Xserver-DTrace">
<articleinfo>
- <title>Xserver provider for DTrace</title>
+ <title>Xserver Provider for DTrace</title>
<author>
<firstname>Alan</firstname><surname>Coopersmith</surname>
<affiliation>
commit 6cae6224994e3252b3b7c7608f983ce73e0206fc
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Fri Sep 23 09:38:24 2011 -0400
dtrace: use docbook copyright markup for copyright holder
No content change to copyright text.
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml
index cd8a812..2427202 100644
--- a/doc/dtrace/Xserver-DTrace.xml
+++ b/doc/dtrace/Xserver-DTrace.xml
@@ -15,11 +15,11 @@
</affiliation>
</author>
<releaseinfo>X.Org Xserver version &xserver.version;</releaseinfo>
+ <copyright><year>2005</year><year>2006</year><year>2007</year><year>2010</year>
+ <holder>Oracle and/or its affiliates. All rights reserved.</holder>
+ </copyright>
<legalnotice id="copyright">
<para>
-Copyright (c) 2005, 2006, 2007, 2010, Oracle and/or its affiliates.
-All rights reserved.
- </para><para>
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
commit 58d3d46d6cc0d7a81db6bad61d158f3b9af8af71
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Thu Sep 1 16:48:37 2011 -0700
Assign ids to more tags in Xserver-Dtrace.xml
Keeps xsltproc from adding random-number id tags to html output so that
it's easier to see real changes vs. different random numbers.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Matt Dew <marcoz at osource.org>
diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml
index 69cd30e..cd8a812 100644
--- a/doc/dtrace/Xserver-DTrace.xml
+++ b/doc/dtrace/Xserver-DTrace.xml
@@ -15,7 +15,7 @@
</affiliation>
</author>
<releaseinfo>X.Org Xserver version &xserver.version;</releaseinfo>
- <legalnotice>
+ <legalnotice id="copyright">
<para>
Copyright (c) 2005, 2006, 2007, 2010, Oracle and/or its affiliates.
All rights reserved.
@@ -79,7 +79,7 @@ DEALINGS IN THE SOFTWARE.
<parameter>arg2</parameter>, etc. These tables should help you
determine what the real data is for each of the probe arguments.
- <table>
+ <table id="Probes_and_their_arguments">
<title>Probes and their arguments</title>
<tgroup cols='7'>
<colspec colname="probe" colwidth="2*"/>
@@ -195,7 +195,7 @@ DEALINGS IN THE SOFTWARE.
To access data buffers referenced via <type>uintptr_t</type>'s, you will
need to use <ulink url="http://wikis.sun.com/display/DTrace/Actions+and+Subroutines#ActionsandSubroutines-{{copyin}}"><function>copyin()</function></ulink>.
- <table>
+ <table id="Probe_Arguments">
<title>Probe Arguments</title>
<tgroup cols='3'>
<colspec colname="arg" colwidth="2*"/>
@@ -313,7 +313,7 @@ DEALINGS IN THE SOFTWARE.
<sect1 id="examples">
<title>Examples</title>
- <example>
+ <example id="Counting_requests_by_request_name">
<title>Counting requests by request name</title>
<para>
@@ -370,7 +370,7 @@ Xserver*:::request-start
</para>
</example>
- <example>
+ <example id="Get_average_CPU_time_per_request">
<title>Get average CPU time per request</title>
<para>This script records the CPU time used between the probes at
@@ -419,7 +419,7 @@ Xserver*:::request-done
</para>
</example>
- <example>
+ <example id="Monitoring_clients_that_connect_and_disconnect">
<title>Monitoring clients that connect and disconnect</title>
<para>
@@ -476,7 +476,7 @@ CPU ID FUNCTION:NAME
</para>
</example>
- <example>
+ <example id="Monitoring_clients_creating_Pixmaps">
<title>Monitoring clients creating Pixmaps</title>
<para>
More information about the xorg-commit
mailing list