Module Name:    xsrc
Committed By:   macallan
Date:           Wed Sep  7 17:10:19 UTC 2016

Modified Files:
        xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi_driver.c
        xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c
        xsrc/external/mit/xf86-video-suncg6/dist/src: cg6_driver.c
        xsrc/external/mit/xf86-video-sunffb/dist/src: ffb_driver.c
        xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_driver.c

Log Message:
 XFree86LOADER is officially no longer optional ( and we didn't treat it as
optional for quite some time ) so start nuking it


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
    xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.11 -r1.12 \
    xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
cvs rdiff -u -r1.11 -r1.12 \
    xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
cvs rdiff -u -r1.9 -r1.10 \
    xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
cvs rdiff -u -r1.10 -r1.11 \
    xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.5 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.6
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.5	Sat Jul  9 22:19:34 2016
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c	Wed Sep  7 17:10:19 2016
@@ -198,8 +198,6 @@ static const OptionInfoRec SMIOptions[] 
     { -1,		     NULL,		  OPTV_NONE,	{0}, FALSE }
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(siliconmotionSetup);
 
 static XF86ModuleVersionInfo SMIVersRec =
@@ -253,8 +251,6 @@ siliconmotionSetup(pointer module, point
     }
 }
 
-#endif /* XFree86LOADER */
-
 static Bool
 SMI_GetRec(ScrnInfoPtr pScrn)
 {
@@ -487,6 +483,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags
     if (pScrn->depth > 8) {
 	/* The defaults are OK for us */
 	rgb zeros = {0, 0, 0};
+
 #if __BYTE_ORDER == __BIG_ENDIAN
 	rgb masks = {0xff00,0xff0000,0xff000000};
 #else

Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.11 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.12
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c:1.11	Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c	Wed Sep  7 17:10:18 2016
@@ -111,8 +111,6 @@ static const OptionInfoRec CG14Options[]
     { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(cg14Setup);
 
 static XF86ModuleVersionInfo suncg14VersRec =
@@ -160,8 +158,6 @@ cg14Setup(pointer module, pointer opts, 
     }
 }
 
-#endif /* XFree86LOADER */
-
 static Bool
 CG14GetRec(ScrnInfoPtr pScrn)
 {

Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.11 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.12
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c:1.11	Fri Aug 19 19:16:01 2016
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6_driver.c	Wed Sep  7 17:10:19 2016
@@ -113,8 +113,6 @@ static const char *xaaSymbols[] =
     NULL
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(cg6Setup);
 
 static XF86ModuleVersionInfo suncg6VersRec =
@@ -158,8 +156,6 @@ cg6Setup(pointer module, pointer opts, i
     }
 }
 
-#endif /* XFree86LOADER */
-
 static Bool
 CG6GetRec(ScrnInfoPtr pScrn)
 {

Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.9 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.10
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.9	Fri Aug 19 19:16:01 2016
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c	Wed Sep  7 17:10:18 2016
@@ -107,8 +107,6 @@ static const OptionInfoRec FFBOptions[] 
     { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(ffbSetup);
 
 static XF86ModuleVersionInfo sunffbVersRec =
@@ -152,8 +150,6 @@ ffbSetup(pointer module, pointer opts, i
     }
 }
 
-#endif /* XFree86LOADER */
-
 static Bool
 FFBGetRec(ScrnInfoPtr pScrn)
 {

Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.10 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.11
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.10	Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c	Wed Sep  7 17:10:18 2016
@@ -103,8 +103,6 @@ static const OptionInfoRec TCXOptions[] 
     { -1,			NULL,		OPTV_NONE,	{0}, FALSE }
 };
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(tcxSetup);
 
 static XF86ModuleVersionInfo suntcxVersRec =
@@ -148,8 +146,6 @@ tcxSetup(pointer module, pointer opts, i
     }
 }
 
-#endif /* XFree86LOADER */
-
 static Bool
 TCXGetRec(ScrnInfoPtr pScrn)
 {

Reply via email to