--- a/open-src/app/gfx-utils/sun-src/fbconf_xorg/fbc/fbc_Modes.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/app/gfx-utils/sun-src/fbconf_xorg/fbc/fbc_Modes.c Wed May 30 13:19:01 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -177,7 +177,7 @@
modes_sectn_ptr = xf86findModes("SunModes", configIR->conf_modes_lst);
if (modes_sectn_ptr == NULL)
- return;
+ return FALSE;
modes = modes_sectn_ptr->mon_modeline_lst;
ptr = modes;
@@ -211,7 +211,7 @@
* removes the external representation of the device specific SunModes section
*/
-int
+void
fbc_remove_monitor_sunmodes_section_ER(
XF86ConfigPtr configIR,
XF86ConfMonitorPtr monitor_sectn_ptr /* Ptr to Monitor section IR */
@@ -245,7 +245,7 @@
* removes the device specific use SunModes entry from the external representation
*/
-int
+void
fbc_remove_monitor_usemodes_entry_ER(
XF86ConfigPtr configIR,
XF86ConfMonitorPtr monitor_sectn_ptr /* Ptr to Monitor section IR */
--- a/open-src/app/gfx-utils/sun-src/fbconf_xorg/fbc/fbc_Modes.h Sat May 26 12:04:58 2012 +0900
+++ b/open-src/app/gfx-utils/sun-src/fbconf_xorg/fbc/fbc_Modes.h Wed May 30 13:19:01 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -42,14 +42,14 @@
char *mode
);
-int
+void
fbc_remove_monitor_sunmodes_section_ER(
XF86ConfigPtr configIR,
XF86ConfMonitorPtr monitor_sectn_ptr /* Ptr to Monitor section IR */
);
-int
-fbc_remove_monitor_sunmodes_section_ER(
+void
+fbc_remove_monitor_usemodes_section_ER(
XF86ConfigPtr configIR,
XF86ConfMonitorPtr monitor_sectn_ptr /* Ptr to Monitor section IR */
);
--- a/open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c Wed May 30 13:19:01 2012 -0700
@@ -266,7 +266,7 @@
astReg = &pAST->SavedReg;
/* Save Misc */
- GetReg(MISC_PORT_READ, astReg->MISC);
+ astReg->MISC = GetReg(MISC_PORT_READ);
/* Save SR */
for (i=0; i<4; i++)
@@ -281,10 +281,10 @@
GetIndexReg(GR_PORT, (UCHAR) (i), astReg->GR[i]);
/* Save AR */
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
for (i=0; i<20; i++)
GetIndexReg(AR_PORT_WRITE, (UCHAR) (i), astReg->AR[i]);
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
SetReg (AR_PORT_WRITE, 0x20); /* set POS */
/* Save DAC */
@@ -320,7 +320,7 @@
SetIndexReg(GR_PORT, (UCHAR) (i), astReg->GR[i]);
/* Restore AR */
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
for (i=0; i<20; i++)
{
SetReg(AR_PORT_WRITE, (UCHAR) i);
@@ -329,7 +329,7 @@
SetReg(AR_PORT_WRITE, 0x14);
SetReg(AR_PORT_WRITE, 0x00);
- GetReg(INPUT_STATUS1_READ, jReg);
+ jReg = GetReg(INPUT_STATUS1_READ);
SetReg (AR_PORT_WRITE, 0x20); /* set POS */
/* Restore DAC */
--- a/open-src/lib/libXaw4/Makefile Sat May 26 12:04:58 2012 +0900
+++ b/open-src/lib/libXaw4/Makefile Wed May 30 13:19:01 2012 -0700
@@ -2,7 +2,7 @@
#
# Xaw4 Makefile
#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -63,6 +63,7 @@
MODULE_INSTALL_MAKEFLAGS=$(CONFIG_ENV) PREFIX=$(MODULE_PREFIX)
MODULE_CFLAGS += -I.
+MODULE_CPPFLAGS += -DSYSV
# Link with version mapfile
MODULE_LD_OPTIONS = -M $(PWD)/mapfile-vers
--- a/open-src/lib/libXaw4/sun-src/Xaw3_1Box.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/lib/libXaw4/sun-src/Xaw3_1Box.c Wed May 30 13:19:01 2012 -0700
@@ -136,7 +136,7 @@
*
*/
-static DoLayout(bbw, width, height, reply_width, reply_height, position)
+static void DoLayout(bbw, width, height, reply_width, reply_height, position)
BoxWidget bbw;
Dimension width, height;
Dimension *reply_width, *reply_height; /* bounding box */
--- a/open-src/lib/libXaw4/sun-src/Xaw3_1List.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/lib/libXaw4/sun-src/Xaw3_1List.c Wed May 30 13:19:01 2012 -0700
@@ -455,6 +455,7 @@
* NOTE: no action taken on an unrealized widget.
*/
+void
PaintItemName(w, item)
Widget w;
int item;
--- a/open-src/lib/libXaw4/sun-src/Xaw3_1Mailbox.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/lib/libXaw4/sun-src/Xaw3_1Mailbox.c Wed May 30 13:19:01 2012 -0700
@@ -291,9 +291,9 @@
/* ARGSUSED */
-static XtTimerCallbackProc clock_tic (client_data, id)
- caddr_t client_data;
- XtIntervalId *id;
+static void clock_tic (
+ caddr_t client_data,
+ XtIntervalId *id)
{
MailboxWidget w = (MailboxWidget) client_data;
--- a/open-src/lib/libXext/sun-src/src/XGrabWin.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/lib/libXext/sun-src/src/XGrabWin.c Wed May 30 13:19:01 2012 -0700
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990, 2009, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 1990, 2012, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -298,7 +298,7 @@
UnlockDisplay(dpy);
SyncHandle();
strcpy(path, rep.path);
- return;
+ return Success;
case USE_EXTRA_PROTOCOL:
case NOT_INITIALIZED:
WxError(dpy,X_WxGetRetainedPath);
--- a/open-src/xserver/xorg/sun-src/tsol/tsolextension.c Sat May 26 12:04:58 2012 +0900
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolextension.c Wed May 30 13:19:01 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -133,7 +133,7 @@
static XID TsolCheckAuthorization (unsigned int name_length,
char *name, unsigned int data_length,
- char *data, ClientPtr client, char **reason);
+ char *data, ClientPtr client, const char **reason);
static void TsolSetClientInfo(ClientPtr client);
@@ -503,12 +503,11 @@
static int
SProcTsolDispatch(register ClientPtr client)
{
- int n;
int retval;
REQUEST(xReq);
- swaps(&stuff->length, n);
+ swaps(&stuff->length);
switch (stuff->data)
{
case X_SetPolyInstInfo:
@@ -562,12 +561,10 @@
static int
SProcSetPolyInstInfo(ClientPtr client)
{
- int n;
-
REQUEST(xSetPolyInstInfoReq);
- swapl(&stuff->uid, n);
- swapl(&stuff->enabled, n);
- swaps(&stuff->sllength, n);
+ swapl(&stuff->uid);
+ swapl(&stuff->enabled);
+ swaps(&stuff->sllength);
return (ProcSetPolyInstInfo(client));
}
@@ -575,14 +572,12 @@
static int
SProcSetPropLabel(ClientPtr client)
{
- int n;
-
REQUEST(xSetPropLabelReq);
- swapl(&stuff->id, n);
- swapl(&stuff->atom, n);
- swaps(&stuff->labelType, n);
- swaps(&stuff->sllength, n);
- swaps(&stuff->illength, n);
+ swapl(&stuff->id);
+ swapl(&stuff->atom);
+ swaps(&stuff->labelType);
+ swaps(&stuff->sllength);
+ swaps(&stuff->illength);
return (ProcSetPropLabel(client));
}
@@ -590,12 +585,10 @@
static int
SProcSetPropUID(ClientPtr client)
{
- int n;
-
REQUEST(xSetPropUIDReq);
- swapl(&stuff->id, n);
- swapl(&stuff->atom, n);
- swapl(&stuff->uid, n);
+ swapl(&stuff->id);
+ swapl(&stuff->atom);
+ swapl(&stuff->uid);
return (ProcSetPropUID(client));
}
@@ -603,14 +596,12 @@
static int
SProcSetResLabel(ClientPtr client)
{
- int n;
-
REQUEST(xSetResLabelReq);
- swapl(&stuff->id, n);
- swaps(&stuff->resourceType, n);
- swaps(&stuff->labelType, n);
- swaps(&stuff->sllength, n);
- swaps(&stuff->illength, n);
+ swapl(&stuff->id);
+ swaps(&stuff->resourceType);
+ swaps(&stuff->labelType);
+ swaps(&stuff->sllength);
+ swaps(&stuff->illength);
return (ProcSetResLabel(client));
}
@@ -618,12 +609,10 @@
static int
SProcSetResUID(ClientPtr client)
{
- int n;
-
REQUEST(xSetResUIDReq);
- swapl(&stuff->id, n);
- swaps(&stuff->resourceType, n);
- swapl(&stuff->uid, n);
+ swapl(&stuff->id);
+ swaps(&stuff->resourceType);
+ swapl(&stuff->uid);
return (ProcSetResUID(client));
}
@@ -631,10 +620,8 @@
static int
SProcGetClientAttributes(ClientPtr client)
{
- int n;
-
REQUEST(xGetClientAttributesReq);
- swapl(&stuff->id, n);
+ swapl(&stuff->id);
return (ProcGetClientAttributes(client));
}
@@ -642,11 +629,9 @@
static int
SProcGetClientLabel(ClientPtr client)
{
- int n;
-
REQUEST(xGetClientLabelReq);
- swapl(&stuff->id, n);
- swaps(&stuff->mask, n);
+ swapl(&stuff->id);
+ swaps(&stuff->mask);
return (ProcGetClientLabel(client));
}
@@ -654,12 +639,10 @@
static int
SProcGetPropAttributes(ClientPtr client)
{
- int n;
-
REQUEST(xGetPropAttributesReq);
- swapl(&stuff->id, n);
- swapl(&stuff->atom, n);
- swaps(&stuff->mask, n);
+ swapl(&stuff->id);
+ swapl(&stuff->atom);
+ swaps(&stuff->mask);
return (ProcGetPropAttributes(client));
}
@@ -667,12 +650,10 @@
static int
SProcGetResAttributes(ClientPtr client)
{
- int n;
-
REQUEST(xGetResAttributesReq);
- swapl(&stuff->id, n);
- swaps(&stuff->resourceType, n);
- swaps(&stuff->mask, n);
+ swapl(&stuff->id);
+ swaps(&stuff->resourceType);
+ swaps(&stuff->mask);
return (ProcGetResAttributes(client));
}
@@ -680,10 +661,8 @@
static int
SProcMakeTPWindow(ClientPtr client)
{
- int n;
-
REQUEST(xMakeTPWindowReq);
- swapl(&stuff->id, n);
+ swapl(&stuff->id);
return (ProcMakeTPWindow(client));
}
@@ -691,10 +670,8 @@
static int
SProcMakeTrustedWindow(ClientPtr client)
{
- int n;
-
REQUEST(xMakeTrustedWindowReq);
- swapl(&stuff->id, n);
+ swapl(&stuff->id);
return (ProcMakeTrustedWindow(client));
}
@@ -702,10 +679,8 @@
static int
SProcMakeUntrustedWindow(ClientPtr client)
{
- int n;
-
REQUEST(xMakeUntrustedWindowReq);
- swapl(&stuff->id, n);
+ swapl(&stuff->id);
return (ProcMakeUntrustedWindow(client));
}
@@ -1080,14 +1055,14 @@
if (client->swapped)
{
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.uid, n);
- swapl(&rep.pid, n);
- swapl(&rep.gid, n);
- swapl(&rep.auditid, n);
- swapl(&rep.sessionid, n);
- swapl(&rep.iaddr, n);
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.uid);
+ swapl(&rep.pid);
+ swapl(&rep.gid);
+ swapl(&rep.auditid);
+ swapl(&rep.sessionid);
+ swapl(&rep.iaddr);
}
WriteToClient(client, sizeof(xGetClientAttributesReply), (char *)&rep);
@@ -1152,10 +1127,10 @@
}
if (client->swapped)
{
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.data00, n);
- swapl(&rep.data01, n);
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.data00);
+ swapl(&rep.data01);
}
WriteToClient(client, sizeof(xGenericReply), (char *)&rep);
@@ -1257,11 +1232,11 @@
}
if (client->swapped)
{
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.uid, n);
- swaps(&rep.sllength, n);
- swaps(&rep.illength, n);
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.uid);
+ swaps(&rep.sllength);
+ swaps(&rep.illength);
}
WriteToClient(client, sizeof(xGetPropAttributesReply), (char *)&rep);
@@ -1351,13 +1326,13 @@
}
if (client->swapped)
{
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
- swapl(&rep.uid, n);
- swapl(&rep.owneruid, n);
- swaps(&rep.sllength, n);
- swaps(&rep.illength, n);
- swaps(&rep.iillength, n);
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.uid);
+ swapl(&rep.owneruid);
+ swaps(&rep.sllength);
+ swaps(&rep.illength);
+ swaps(&rep.iillength);
}
WriteToClient(client, sizeof(xGetResAttributesReply), (char *)&rep);
@@ -1783,7 +1758,7 @@
static XID
TsolCheckAuthorization(unsigned int name_length, char *name,
unsigned int data_length, char *data,
- ClientPtr client, char **reason)
+ ClientPtr client, const char **reason)
{
char domainname[128];
char netname[128];
--- a/open-src/xserver/xorg/xtsol.patch Sat May 26 12:04:58 2012 +0900
+++ b/open-src/xserver/xorg/xtsol.patch Wed May 30 13:19:01 2012 -0700
@@ -405,7 +405,7 @@
+typedef struct
+{
+ XID (*CheckAuthorization)(unsigned int, char *, unsigned int,
-+ char *, ClientPtr , char **);
++ char *, ClientPtr , const char **);
+ int (*ChangeWindowProperty)(ClientPtr, WindowPtr, Atom, Atom, int, int,
+ unsigned long, pointer, Bool);
+ int (*DeleteProperty)(ClientPtr, WindowPtr, Atom);