equal
deleted
inserted
replaced
1 diff -urp -x '*~' -x '*.orig' mi/micmap.c mi/micmap.c |
1 diff -Nurp -x '*~' -x '*.orig' mi/micmap.c mi/micmap.c |
2 --- mi/micmap.c 2009-10-27 23:56:24.000000000 -0700 |
2 --- mi/micmap.c 2010-06-10 07:07:55.000000000 -0700 |
3 +++ mi/micmap.c 2009-12-02 18:58:23.806599766 -0800 |
3 +++ mi/micmap.c 2010-09-03 16:45:35.359696561 -0700 |
4 @@ -499,6 +499,11 @@ maskShift (Pixel p) |
4 @@ -494,6 +494,11 @@ maskShift (Pixel p) |
5 * the set which can be used with this version of cfb. |
5 * the set which can be used with this version of cfb. |
6 */ |
6 */ |
7 |
7 |
8 +#if defined(__sparc__) || defined(__sparc) |
8 +#if defined(__sparc__) || defined(__sparc) |
9 +_X_EXPORT miInitVisualsProcPtr miInitVisualsProc = NULL; |
9 +_X_EXPORT miInitVisualsProcPtr miInitVisualsProc = NULL; |
11 + |
11 + |
12 + |
12 + |
13 Bool |
13 Bool |
14 miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, |
14 miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, |
15 int *ndepthp, int *rootDepthp, VisualID *defaultVisp, |
15 int *ndepthp, int *rootDepthp, VisualID *defaultVisp, |
16 @@ -518,6 +523,13 @@ miInitVisuals(VisualPtr *visualp, DepthP |
16 @@ -513,6 +518,13 @@ miInitVisuals(VisualPtr *visualp, DepthP |
17 int *preferredCVCs, *prefp; |
17 int *preferredCVCs, *prefp; |
18 int first_depth; |
18 int first_depth; |
19 |
19 |
20 +#if defined(__sparc__) || defined(__sparc) |
20 +#if defined(__sparc__) || defined(__sparc) |
21 + if (miInitVisualsProc) { |
21 + if (miInitVisualsProc) { |