libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 199 insertions, 231 deletions

diff --git a/xorg-server/include/swaprep.h b/xorg-server/include/swaprep.h
index 8c02737d3..3fa2a090c 100644
--- a/xorg-server/include/swaprep.h
+++ b/xorg-server/include/swaprep.h
@@ -26,236 +26,204 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef SWAPREP_H
 #define SWAPREP_H 1
 
-extern _X_EXPORT void Swap32Write(
-    ClientPtr /* pClient */,
-    int /* size */,
-    CARD32 * /* pbuf */);
-
-extern _X_EXPORT void CopySwap32Write(
-    ClientPtr /* pClient */,
-    int /* size */,
-    CARD32 * /* pbuf */);
-
-extern _X_EXPORT void CopySwap16Write(
-    ClientPtr /* pClient */,
-    int /* size */,
-    short * /* pbuf */);
-
-extern _X_EXPORT void SGenericReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGenericReply * /* pRep */);
-
-extern _X_EXPORT void SGetWindowAttributesReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetWindowAttributesReply * /* pRep */);
-
-extern _X_EXPORT void SGetGeometryReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetGeometryReply * /* pRep */);
-
-extern _X_EXPORT void SQueryTreeReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryTreeReply * /* pRep */);
-
-extern _X_EXPORT void SInternAtomReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xInternAtomReply * /* pRep */);
-
-extern _X_EXPORT void SGetAtomNameReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetAtomNameReply * /* pRep */);
-
-extern _X_EXPORT void SGetPropertyReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetPropertyReply * /* pRep */);
-
-extern _X_EXPORT void SListPropertiesReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xListPropertiesReply * /* pRep */);
-
-extern _X_EXPORT void SGetSelectionOwnerReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetSelectionOwnerReply * /* pRep */);
-
-extern _X_EXPORT void SQueryPointerReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryPointerReply * /* pRep */);
-
-extern _X_EXPORT void SwapTimeCoordWrite(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xTimecoord * /* pRep */);
-
-extern _X_EXPORT void SGetMotionEventsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetMotionEventsReply * /* pRep */);
-
-extern _X_EXPORT void STranslateCoordsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xTranslateCoordsReply * /* pRep */);
-
-extern _X_EXPORT void SGetInputFocusReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetInputFocusReply * /* pRep */);
-
-extern _X_EXPORT void SQueryKeymapReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryKeymapReply * /* pRep */);
-
-extern _X_EXPORT void SQueryFontReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryFontReply * /* pRep */);
-
-extern _X_EXPORT void SQueryTextExtentsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryTextExtentsReply * /* pRep */);
-
-extern _X_EXPORT void SListFontsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xListFontsReply * /* pRep */);
-
-extern _X_EXPORT void SListFontsWithInfoReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xListFontsWithInfoReply * /* pRep */);
-
-extern _X_EXPORT void SGetFontPathReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetFontPathReply * /* pRep */);
-
-extern _X_EXPORT void SGetImageReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetImageReply * /* pRep */);
-
-extern _X_EXPORT void SListInstalledColormapsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xListInstalledColormapsReply * /* pRep */);
-
-extern _X_EXPORT void SAllocColorReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xAllocColorReply * /* pRep */);
-
-extern _X_EXPORT void SAllocNamedColorReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xAllocNamedColorReply * /* pRep */);
-
-extern _X_EXPORT void SAllocColorCellsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xAllocColorCellsReply * /* pRep */);
-
-extern _X_EXPORT void SAllocColorPlanesReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xAllocColorPlanesReply * /* pRep */);
-
-extern _X_EXPORT void SQColorsExtend(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xrgb * /* prgb */);
-
-extern _X_EXPORT void SQueryColorsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryColorsReply * /* pRep */);
-
-extern _X_EXPORT void SLookupColorReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xLookupColorReply * /* pRep */);
-
-extern _X_EXPORT void SQueryBestSizeReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xQueryBestSizeReply * /* pRep */);
-
-extern _X_EXPORT void SListExtensionsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xListExtensionsReply * /* pRep */);
-
-extern _X_EXPORT void SGetKeyboardMappingReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetKeyboardMappingReply * /* pRep */);
-
-extern _X_EXPORT void SGetPointerMappingReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetPointerMappingReply * /* pRep */);
-
-extern _X_EXPORT void SGetModifierMappingReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetModifierMappingReply * /* pRep */);
-
-extern _X_EXPORT void SGetKeyboardControlReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetKeyboardControlReply * /* pRep */);
-
-extern _X_EXPORT void SGetPointerControlReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetPointerControlReply * /* pRep */);
-
-extern _X_EXPORT void SGetScreenSaverReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xGetScreenSaverReply * /* pRep */);
-
-extern _X_EXPORT void SLHostsExtend(
-    ClientPtr /* pClient */,
-    int /* size */,
-    char * /* buf */);
-
-extern _X_EXPORT void SListHostsReply(
-    ClientPtr /* pClient */,
-    int /* size */,
-    xListHostsReply * /* pRep */);
-
-extern _X_EXPORT void SErrorEvent(
-    xError * /* from */,
-    xError * /* to */);
-
-extern _X_EXPORT void SwapConnSetupInfo(
-    char * /* pInfo */,
-    char * /* pInfoTBase */);
-
-extern _X_EXPORT void WriteSConnectionInfo(
-    ClientPtr /* pClient */,
-    unsigned long /* size */,
-    char * /* pInfo */);
-
-extern _X_EXPORT void SwapConnSetupPrefix(
-    xConnSetupPrefix * /* pcspFrom */,
-    xConnSetupPrefix * /* pcspTo */);
-
-extern _X_EXPORT void WriteSConnSetupPrefix(
-    ClientPtr /* pClient */,
-    xConnSetupPrefix * /* pcsp */);
+extern _X_EXPORT void Swap32Write(ClientPtr /* pClient */ ,
+                                  int /* size */ ,
+                                  CARD32 * /* pbuf */ );
+
+extern _X_EXPORT void CopySwap32Write(ClientPtr /* pClient */ ,
+                                      int /* size */ ,
+                                      CARD32 * /* pbuf */ );
+
+extern _X_EXPORT void CopySwap16Write(ClientPtr /* pClient */ ,
+                                      int /* size */ ,
+                                      short * /* pbuf */ );
+
+extern _X_EXPORT void SGenericReply(ClientPtr /* pClient */ ,
+                                    int /* size */ ,
+                                    xGenericReply * /* pRep */ );
+
+extern _X_EXPORT void SGetWindowAttributesReply(ClientPtr /* pClient */ ,
+                                                int /* size */ ,
+                                                xGetWindowAttributesReply *
+                                                /* pRep */ );
+
+extern _X_EXPORT void SGetGeometryReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xGetGeometryReply * /* pRep */ );
+
+extern _X_EXPORT void SQueryTreeReply(ClientPtr /* pClient */ ,
+                                      int /* size */ ,
+                                      xQueryTreeReply * /* pRep */ );
+
+extern _X_EXPORT void SInternAtomReply(ClientPtr /* pClient */ ,
+                                       int /* size */ ,
+                                       xInternAtomReply * /* pRep */ );
+
+extern _X_EXPORT void SGetAtomNameReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xGetAtomNameReply * /* pRep */ );
+
+extern _X_EXPORT void SGetPropertyReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xGetPropertyReply * /* pRep */ );
+
+extern _X_EXPORT void SListPropertiesReply(ClientPtr /* pClient */ ,
+                                           int /* size */ ,
+                                           xListPropertiesReply * /* pRep */ );
+
+extern _X_EXPORT void SGetSelectionOwnerReply(ClientPtr /* pClient */ ,
+                                              int /* size */ ,
+                                              xGetSelectionOwnerReply *
+                                              /* pRep */ );
+
+extern _X_EXPORT void SQueryPointerReply(ClientPtr /* pClient */ ,
+                                         int /* size */ ,
+                                         xQueryPointerReply * /* pRep */ );
+
+extern _X_EXPORT void SwapTimeCoordWrite(ClientPtr /* pClient */ ,
+                                         int /* size */ ,
+                                         xTimecoord * /* pRep */ );
+
+extern _X_EXPORT void SGetMotionEventsReply(ClientPtr /* pClient */ ,
+                                            int /* size */ ,
+                                            xGetMotionEventsReply * /* pRep */
+                                            );
+
+extern _X_EXPORT void STranslateCoordsReply(ClientPtr /* pClient */ ,
+                                            int /* size */ ,
+                                            xTranslateCoordsReply * /* pRep */
+                                            );
+
+extern _X_EXPORT void SGetInputFocusReply(ClientPtr /* pClient */ ,
+                                          int /* size */ ,
+                                          xGetInputFocusReply * /* pRep */ );
+
+extern _X_EXPORT void SQueryKeymapReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xQueryKeymapReply * /* pRep */ );
+
+extern _X_EXPORT void SQueryFontReply(ClientPtr /* pClient */ ,
+                                      int /* size */ ,
+                                      xQueryFontReply * /* pRep */ );
+
+extern _X_EXPORT void SQueryTextExtentsReply(ClientPtr /* pClient */ ,
+                                             int /* size */ ,
+                                             xQueryTextExtentsReply * /* pRep */
+                                             );
+
+extern _X_EXPORT void SListFontsReply(ClientPtr /* pClient */ ,
+                                      int /* size */ ,
+                                      xListFontsReply * /* pRep */ );
+
+extern _X_EXPORT void SListFontsWithInfoReply(ClientPtr /* pClient */ ,
+                                              int /* size */ ,
+                                              xListFontsWithInfoReply *
+                                              /* pRep */ );
+
+extern _X_EXPORT void SGetFontPathReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xGetFontPathReply * /* pRep */ );
+
+extern _X_EXPORT void SGetImageReply(ClientPtr /* pClient */ ,
+                                     int /* size */ ,
+                                     xGetImageReply * /* pRep */ );
+
+extern _X_EXPORT void SListInstalledColormapsReply(ClientPtr /* pClient */ ,
+                                                   int /* size */ ,
+                                                   xListInstalledColormapsReply
+                                                   * /* pRep */ );
+
+extern _X_EXPORT void SAllocColorReply(ClientPtr /* pClient */ ,
+                                       int /* size */ ,
+                                       xAllocColorReply * /* pRep */ );
+
+extern _X_EXPORT void SAllocNamedColorReply(ClientPtr /* pClient */ ,
+                                            int /* size */ ,
+                                            xAllocNamedColorReply * /* pRep */
+                                            );
+
+extern _X_EXPORT void SAllocColorCellsReply(ClientPtr /* pClient */ ,
+                                            int /* size */ ,
+                                            xAllocColorCellsReply * /* pRep */
+                                            );
+
+extern _X_EXPORT void SAllocColorPlanesReply(ClientPtr /* pClient */ ,
+                                             int /* size */ ,
+                                             xAllocColorPlanesReply * /* pRep */
+                                             );
+
+extern _X_EXPORT void SQColorsExtend(ClientPtr /* pClient */ ,
+                                     int /* size */ ,
+                                     xrgb * /* prgb */ );
+
+extern _X_EXPORT void SQueryColorsReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xQueryColorsReply * /* pRep */ );
+
+extern _X_EXPORT void SLookupColorReply(ClientPtr /* pClient */ ,
+                                        int /* size */ ,
+                                        xLookupColorReply * /* pRep */ );
+
+extern _X_EXPORT void SQueryBestSizeReply(ClientPtr /* pClient */ ,
+                                          int /* size */ ,
+                                          xQueryBestSizeReply * /* pRep */ );
+
+extern _X_EXPORT void SListExtensionsReply(ClientPtr /* pClient */ ,
+                                           int /* size */ ,
+                                           xListExtensionsReply * /* pRep */ );
+
+extern _X_EXPORT void SGetKeyboardMappingReply(ClientPtr /* pClient */ ,
+                                               int /* size */ ,
+                                               xGetKeyboardMappingReply *
+                                               /* pRep */ );
+
+extern _X_EXPORT void SGetPointerMappingReply(ClientPtr /* pClient */ ,
+                                              int /* size */ ,
+                                              xGetPointerMappingReply *
+                                              /* pRep */ );
+
+extern _X_EXPORT void SGetModifierMappingReply(ClientPtr /* pClient */ ,
+                                               int /* size */ ,
+                                               xGetModifierMappingReply *
+                                               /* pRep */ );
+
+extern _X_EXPORT void SGetKeyboardControlReply(ClientPtr /* pClient */ ,
+                                               int /* size */ ,
+                                               xGetKeyboardControlReply *
+                                               /* pRep */ );
+
+extern _X_EXPORT void SGetPointerControlReply(ClientPtr /* pClient */ ,
+                                              int /* size */ ,
+                                              xGetPointerControlReply *
+                                              /* pRep */ );
+
+extern _X_EXPORT void SGetScreenSaverReply(ClientPtr /* pClient */ ,
+                                           int /* size */ ,
+                                           xGetScreenSaverReply * /* pRep */ );
+
+extern _X_EXPORT void SLHostsExtend(ClientPtr /* pClient */ ,
+                                    int /* size */ ,
+                                    char * /* buf */ );
+
+extern _X_EXPORT void SListHostsReply(ClientPtr /* pClient */ ,
+                                      int /* size */ ,
+                                      xListHostsReply * /* pRep */ );
+
+extern _X_EXPORT void SErrorEvent(xError * /* from */ ,
+                                  xError * /* to */ );
+
+extern _X_EXPORT void SwapConnSetupInfo(char * /* pInfo */ ,
+                                        char * /* pInfoTBase */ );
+
+extern _X_EXPORT void WriteSConnectionInfo(ClientPtr /* pClient */ ,
+                                           unsigned long /* size */ ,
+                                           char * /* pInfo */ );
+
+extern _X_EXPORT void SwapConnSetupPrefix(xConnSetupPrefix * /* pcspFrom */ ,
+                                          xConnSetupPrefix * /* pcspTo */ );
+
+extern _X_EXPORT void WriteSConnSetupPrefix(ClientPtr /* pClient */ ,
+                                            xConnSetupPrefix * /* pcsp */ );
 
 #undef SWAPREP_PROC
 #define SWAPREP_PROC(func) extern _X_EXPORT void func(xEvent * /* from */, xEvent * /* to */)
@@ -289,4 +257,4 @@ SWAPREP_PROC(SVisibilityEvent);
 
 #undef SWAPREP_PROC
 
-#endif /* SWAPREP_H */
+#endif                          /* SWAPREP_H */