Neither of these are used from outside the server. Signed-off-by: Adam Jackson <a...@redhat.com> --- hw/xfree86/common/xf86.h | 2 -- hw/xfree86/common/xf86Helper.c | 6 ------ hw/xfree86/common/xf86Priv.h | 2 +- hw/xfree86/doc/ddxDesign.xml | 12 ------------ 4 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 1cde478..38b901f 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -306,8 +306,6 @@ xf86ServerIsExiting(void); extern _X_EXPORT Bool xf86ServerIsResetting(void); extern _X_EXPORT Bool -xf86ServerIsInitialising(void); -extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void); extern _X_EXPORT Bool xf86CaughtSignal(void); diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index c42e93e..a0793b1 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1516,12 +1516,6 @@ xf86ServerIsResetting(void) } Bool -xf86ServerIsInitialising(void) -{ - return xf86Initialising; -} - -Bool xf86ServerIsOnlyDetecting(void) { return xf86DoConfigure; diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 6e374eb..ad3f2b9 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -86,7 +86,7 @@ extern _X_EXPORT serverLayoutRec xf86ConfigLayout; extern _X_EXPORT DriverPtr *xf86DriverList; extern _X_EXPORT int xf86NumDrivers; extern _X_EXPORT Bool xf86Resetting; -extern _X_EXPORT Bool xf86Initialising; +extern Bool xf86Initialising; extern _X_EXPORT int xf86NumScreens; extern _X_EXPORT const char *xf86VisualNames[]; extern _X_EXPORT int xf86Verbose; /* verbosity level */ diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index aed77a9..3c883dc 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -2054,18 +2054,6 @@ functions is as follows: <blockquote><para> <programlisting> - Bool xf86ServerIsInitialising(); - </programlisting> - <blockquote><para> - Returns <constant>TRUE</constant> if the server is at the beginning of - a generation and is in the process of initialising, and - <constant>FALSE</constant> otherwise. - </para></blockquote> - - </para></blockquote> - - <blockquote><para> - <programlisting> Bool xf86ServerIsOnlyProbing(); </programlisting> <blockquote><para> -- 2.5.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel