diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-01-06 08:30:07 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-04-18 11:22:58 -0400 |
| commit | 0cd2a24b61ef1583fc6b3fec7d01c7481cc97d52 (patch) | |
| tree | 9f22af7a32872bf54a06960b166c3fcafd65667d /hw/xfree86 | |
| parent | e70ee11a39b957141fbc565d79d128a46fac5f34 (diff) | |
xfree86: Unexport xf86Initialising, remove xf86ServerIsInitialising
Neither of these are used from outside the server.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Priv.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/doc/ddxDesign.xml | 12 |
4 files changed, 1 insertions, 21 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 1cde47873..38b901f37 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 3b01a49b5..e6dd4a61f 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 6e374eb7e..ad3f2b9f9 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 53647d066..f7d66285e 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> |