Solved compile errors

7 files changed, 90 insertions, 80 deletions

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 92c16153e..2e0acbb00 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -195,6 +195,7 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\errors.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\nvprogram.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 4a27037e6..9d055d416 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -704,6 +704,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

diff --git a/pixman/pixman/makefile b/pixman/pixman/makefile
index 1ec9b8e16..bcb47221b 100644
--- a/pixman/pixman/makefile
+++ b/pixman/pixman/makefile
@@ -29,6 +29,7 @@ CSRCS =			\
 	pixman-region16.c		\
 	pixman-region32.c		\
 	pixman-solid-fill.c		\
+	pixman-srgb.c			\
 	pixman-timer.c			\
 	pixman-trap.c			\
 	pixman-utils.c			\
@@ -41,6 +42,9 @@ BUILT_SOURCES =				\
 	pixman-combine64.h		\
 	$(NULL)
 
+$(OBJDIR)\pixman-srgb.c: make-srgb.pl
+	perl make-srgb.pl > $@
+
 $(OBJDIR)\pixman-combine32.c : pixman-combine.c.template $(OBJDIR)\pixman-combine32.h make-combine.pl
 	perl make-combine.pl 8 < pixman-combine.c.template > $@
 $(OBJDIR)\pixman-combine32.h : pixman-combine.h.template make-combine.pl
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index 910e437c2..7473e6de1 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -37,8 +37,10 @@
 #include "misc.h"
 #include "winmsg.h"
 #include <unistd.h>
-/*
+
 extern Bool		g_fClipboardPrimary;
+
+/*
  * Process any pending X events
  */
 
diff --git a/xorg-server/randr/rrprovider.c b/xorg-server/randr/rrprovider.c
index c4ed515d6..14d2d3db3 100644
--- a/xorg-server/randr/rrprovider.c
+++ b/xorg-server/randr/rrprovider.c
@@ -89,23 +89,23 @@ ProcRRGetProviders (ClientPtr client)
 
     if (!pScrPriv)
     {
-        rep = (xRRGetProvidersReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .timestamp = currentTime.milliseconds,
-            .nProviders = 0
-        };
+ 
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.length = 0;
+        rep.timestamp = currentTime.milliseconds;
+        rep.nProviders = 0;
+
         extra = NULL;
         extraLen = 0;
     } else {
-        rep = (xRRGetProvidersReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .timestamp = pScrPriv->lastSetTime.milliseconds,
-            .nProviders = total_providers,
-            .length = total_providers
-        };
+
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+        rep.nProviders = total_providers;
+        rep.length = total_providers;
+
         extraLen = rep.length << 2;
         if (extraLen) {
             extra = malloc(extraLen);
@@ -166,18 +166,18 @@ ProcRRGetProviderInfo (ClientPtr client)
     pScreen = provider->pScreen;
     pScrPriv = rrGetScrPriv(pScreen);
 
-    rep = (xRRGetProviderInfoReply) {
-        .type = X_Reply,
-        .status = RRSetConfigSuccess,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .capabilities = provider->capabilities,
-        .nameLength = provider->nameLength,
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .nCrtcs = pScrPriv->numCrtcs,
-        .nOutputs = pScrPriv->numOutputs,
-        .nAssociatedProviders = 0
-    };
+
+    rep.type = X_Reply;
+    rep.status = RRSetConfigSuccess;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.capabilities = provider->capabilities;
+    rep.nameLength = provider->nameLength;
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+    rep.nCrtcs = pScrPriv->numCrtcs;
+    rep.nOutputs = pScrPriv->numOutputs;
+    rep.nAssociatedProviders = 0;
+
 
     /* count associated providers */
     if (provider->offload_sink)
diff --git a/xorg-server/randr/rrproviderproperty.c b/xorg-server/randr/rrproviderproperty.c
index e0a814ff8..a24d9d784 100644
--- a/xorg-server/randr/rrproviderproperty.c
+++ b/xorg-server/randr/rrproviderproperty.c
@@ -65,14 +65,14 @@ RRDestroyProviderProperty(RRPropertyPtr prop)
 static void
 RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop)
 {
-    xRRProviderPropertyNotifyEvent event = {
-        .type = RREventBase + RRNotify,
-        .subCode = RRNotify_ProviderProperty,
-        .provider = provider->id,
-        .state = PropertyDelete,
-        .atom = prop->propertyName,
-        .timestamp = currentTime.milliseconds
-    };
+    xRRProviderPropertyNotifyEvent event;
+    event.type = RREventBase + RRNotify;
+    event.subCode = RRNotify_ProviderProperty;
+    event.provider = provider->id;
+    event.state = PropertyDelete;
+    event.atom = prop->propertyName;
+    event.timestamp = currentTime.milliseconds;
+
 
     RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
 
@@ -236,14 +236,14 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
         provider->pendingProperties = TRUE;
 
     if (sendevent) {
-        xRRProviderPropertyNotifyEvent event = {
-            .type = RREventBase + RRNotify,
-            .subCode = RRNotify_ProviderProperty,
-            .provider = provider->id,
-            .state = PropertyNewValue,
-            .atom = prop->propertyName,
-            .timestamp = currentTime.milliseconds
-        };
+        xRRProviderPropertyNotifyEvent event;
+        event.type = RREventBase + RRNotify;
+        event.subCode = RRNotify_ProviderProperty;
+        event.provider = provider->id;
+        event.state = PropertyNewValue;
+        event.atom = prop->propertyName;
+        event.timestamp = currentTime.milliseconds;
+
         RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
     }
     return Success;
@@ -395,12 +395,12 @@ ProcRRListProviderProperties(ClientPtr client)
         if (!(pAtoms = (Atom *) malloc(numProps * sizeof(Atom))))
             return BadAlloc;
 
-    rep = (xRRListProviderPropertiesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(numProps * sizeof(Atom)),
-        .nAtoms = numProps
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(numProps * sizeof(Atom));
+    rep.nAtoms = numProps;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -441,14 +441,14 @@ ProcRRQueryProviderProperty(ClientPtr client)
         if (!extra)
             return BadAlloc;
     }
-    rep = (xRRQueryProviderPropertyReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = prop->num_valid,
-        .pending = prop->is_pending,
-        .range = prop->range,
-        .immutable = prop->immutable
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = prop->num_valid;
+    rep.pending = prop->is_pending;
+    rep.range = prop->range;
+    rep.immutable = prop->immutable;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -573,12 +573,12 @@ ProcRRGetProviderProperty(ClientPtr client)
     RRPropertyValuePtr prop_value;
     unsigned long n, len, ind;
     RRProviderPtr provider;
-    xRRGetProviderPropertyReply reply = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence
-    };
+    xRRGetProviderPropertyReply reply;
     char *extra = NULL;
 
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+
     REQUEST_SIZE_MATCH(xRRGetProviderPropertyReq);
     if (stuff->delete)
         UpdateCurrentTime();
@@ -678,14 +678,14 @@ ProcRRGetProviderProperty(ClientPtr client)
     reply.propertyType = prop_value->type;
 
     if (stuff->delete && (reply.bytesAfter == 0)) {
-        xRRProviderPropertyNotifyEvent event = {
-            .type = RREventBase + RRNotify,
-            .subCode = RRNotify_ProviderProperty,
-            .provider = provider->id,
-            .state = PropertyDelete,
-            .atom = prop->propertyName,
-            .timestamp = currentTime.milliseconds
-        };
+        xRRProviderPropertyNotifyEvent event;
+        event.type = RREventBase + RRNotify;
+        event.subCode = RRNotify_ProviderProperty;
+        event.provider = provider->id;
+        event.state = PropertyDelete;
+        event.atom = prop->propertyName;
+        event.timestamp = currentTime.milliseconds;
+
         RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
     }
 
diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c
index 45c5139c9..c11882b53 100644
--- a/xorg-server/randr/rrscreen.c
+++ b/xorg-server/randr/rrscreen.c
@@ -395,17 +395,17 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
     ErrorF("reporting %d %d %d %d\n", total_crtcs, total_outputs, total_modes, total_name_len);
 
     pScrPriv = rrGetScrPriv(pScreen);
-    rep = (xRRGetScreenResourcesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
-        .nCrtcs = total_crtcs,
-        .nOutputs = total_outputs,
-        .nModes = total_modes,
-        .nbytesNames = total_name_len
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+    rep.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
+    rep.nCrtcs = total_crtcs;
+    rep.nOutputs = total_outputs;
+    rep.nModes = total_modes;
+    rep.nbytesNames = total_name_len;
+
 
     rep.length = (total_crtcs + total_outputs + total_modes * bytes_to_int32(SIZEOF(xRRModeInfo)) +
                   bytes_to_int32(rep.nbytesNames));