[PATCH libxtrans] Fix potential wrong use of {ISC, SCO}Funcs in Xtrans.c (#23324)

Alan Coopersmith alan.coopersmith at oracle.com
Fri Sep 3 08:35:56 PDT 2010


Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

(For completeness, there's a couple stray references to ISC still
 left in Xtranslcl.c in comments and the DEF_XLOCAL #define.)

Jesse Adkins wrote:
> ISCFuncs are no longer created by Xtranslcl.c as of Aug 7 2008
> git commit 339ddc413559d4cb117a72f87b2a70dae6911c32.
> 
> SCOFuncs is only created if __SCO__ or __UNIXWARE__ are defined.
> 
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  Xtrans.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/Xtrans.c b/Xtrans.c
> index 7b18f10..204a918 100644
> --- a/Xtrans.c
> +++ b/Xtrans.c
> @@ -109,9 +109,7 @@ Xtransport_table Xtransports[] = {
>  #ifdef sun
>      { &TRANS(PIPEFuncs),	TRANS_LOCAL_PIPE_INDEX },
>  #else /* !sun */
> -#if !defined(__SCO__) && !defined(__UNIXWARE__)
> -    { &TRANS(ISCFuncs),		TRANS_LOCAL_ISC_INDEX },
> -#endif
> +#if defined(__SCO__) || defined(__UNIXWARE__)
>      { &TRANS(SCOFuncs),		TRANS_LOCAL_SCO_INDEX },
>  #endif /* sun */
>  #endif /* LOCALCONN */


-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list