Skip to content

Commit 93ed0fc

Browse files
tmzttmzt
committed
fix configure.ac merge conflict
2 parents 30f5966 + d738175 commit 93ed0fc

File tree

325 files changed

+15980
-23782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+15980
-23782
lines changed

‎Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ DISTCHECK_CONFIGURE_FLAGS=\
5656
--with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \
5757
--with-xkb-output='$${datadir}/X11/xkb/compiled'
5858

59-
DISTCLEANFILES = doltcompile doltlibtool
60-
6159
.PHONY: ChangeLog INSTALL
6260

6361
INSTALL:

‎Xext/bigreq.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,8 @@ from The Open Group.
4040
#include "opaque.h"
4141
#include "modinit.h"
4242

43-
static DISPATCH_PROC(ProcBigReqDispatch);
44-
4543
void BigReqExtensionInit(INITARGS);
4644

47-
void
48-
BigReqExtensionInit(INITARGS)
49-
{
50-
AddExtension(XBigReqExtensionName, 0, 0,
51-
ProcBigReqDispatch, ProcBigReqDispatch,
52-
NULL, StandardMinorOpcode);
53-
}
54-
5545
static int
5646
ProcBigReqDispatch (ClientPtr client)
5747
{
@@ -78,3 +68,11 @@ ProcBigReqDispatch (ClientPtr client)
7868
WriteToClient(client, sizeof(xBigReqEnableReply), (char *)&rep);
7969
return Success;
8070
}
71+
72+
void
73+
BigReqExtensionInit(INITARGS)
74+
{
75+
AddExtension(XBigReqExtensionName, 0, 0,
76+
ProcBigReqDispatch, ProcBigReqDispatch,
77+
NULL, StandardMinorOpcode);
78+
}

‎Xext/geext.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#endif
2929
#include "windowstr.h"
3030
#include <X11/extensions/ge.h>
31-
#include "registry.h"
3231

3332
#include "geint.h"
3433
#include "geext.h"

‎Xext/saver.c

Lines changed: 33 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,6 @@ in this Software without prior written authorization from the X Consortium.
6262

6363
static int ScreenSaverEventBase = 0;
6464

65-
static DISPATCH_PROC(ProcScreenSaverQueryInfo);
66-
static DISPATCH_PROC(ProcScreenSaverDispatch);
67-
static DISPATCH_PROC(ProcScreenSaverQueryVersion);
68-
static DISPATCH_PROC(ProcScreenSaverSelectInput);
69-
static DISPATCH_PROC(ProcScreenSaverSetAttributes);
70-
static DISPATCH_PROC(ProcScreenSaverUnsetAttributes);
71-
static DISPATCH_PROC(ProcScreenSaverSuspend);
72-
static DISPATCH_PROC(SProcScreenSaverDispatch);
73-
static DISPATCH_PROC(SProcScreenSaverQueryInfo);
74-
static DISPATCH_PROC(SProcScreenSaverQueryVersion);
75-
static DISPATCH_PROC(SProcScreenSaverSelectInput);
76-
static DISPATCH_PROC(SProcScreenSaverSetAttributes);
77-
static DISPATCH_PROC(SProcScreenSaverUnsetAttributes);
78-
static DISPATCH_PROC(SProcScreenSaverSuspend);
7965

8066
static Bool ScreenSaverHandle (
8167
ScreenPtr /* pScreen */,
@@ -237,45 +223,6 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
237223

238224
#define New(t) (malloc(sizeof (t)))
239225

240-
/****************
241-
* ScreenSaverExtensionInit
242-
*
243-
* Called from InitExtensions in main() or from QueryExtension() if the
244-
* extension is dynamically loaded.
245-
*
246-
****************/
247-
248-
void
249-
ScreenSaverExtensionInit(INITARGS)
250-
{
251-
ExtensionEntry *extEntry;
252-
int i;
253-
ScreenPtr pScreen;
254-
255-
if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
256-
return;
257-
258-
AttrType = CreateNewResourceType(ScreenSaverFreeAttr, "SaverAttr");
259-
SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents,
260-
"SaverEvent");
261-
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend,
262-
"SaverSuspend");
263-
264-
for (i = 0; i < screenInfo.numScreens; i++)
265-
{
266-
pScreen = screenInfo.screens[i];
267-
SetScreenPrivate (pScreen, NULL);
268-
}
269-
if (AttrType && SaverEventType && SuspendType &&
270-
(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
271-
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
272-
NULL, StandardMinorOpcode)))
273-
{
274-
ScreenSaverEventBase = extEntry->eventBase;
275-
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
276-
}
277-
}
278-
279226
static void
280227
CheckScreenPrivate (ScreenPtr pScreen)
281228
{
@@ -1412,7 +1359,7 @@ ProcScreenSaverSuspend (ClientPtr client)
14121359
return Success;
14131360
}
14141361

1415-
static DISPATCH_PROC((*NormalVector[])) = {
1362+
static int (*NormalVector[]) (ClientPtr /* client */) = {
14161363
ProcScreenSaverQueryVersion,
14171364
ProcScreenSaverQueryInfo,
14181365
ProcScreenSaverSelectInput,
@@ -1513,7 +1460,7 @@ SProcScreenSaverSuspend (ClientPtr client)
15131460
return ProcScreenSaverSuspend (client);
15141461
}
15151462

1516-
static DISPATCH_PROC((*SwappedVector[])) = {
1463+
static int (*SwappedVector[]) (ClientPtr /* client */) = {
15171464
SProcScreenSaverQueryVersion,
15181465
SProcScreenSaverQueryInfo,
15191466
SProcScreenSaverSelectInput,
@@ -1531,3 +1478,34 @@ SProcScreenSaverDispatch (ClientPtr client)
15311478
return (*SwappedVector[stuff->data])(client);
15321479
return BadRequest;
15331480
}
1481+
1482+
void
1483+
ScreenSaverExtensionInit(INITARGS)
1484+
{
1485+
ExtensionEntry *extEntry;
1486+
int i;
1487+
ScreenPtr pScreen;
1488+
1489+
if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
1490+
return;
1491+
1492+
AttrType = CreateNewResourceType(ScreenSaverFreeAttr, "SaverAttr");
1493+
SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents,
1494+
"SaverEvent");
1495+
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend,
1496+
"SaverSuspend");
1497+
1498+
for (i = 0; i < screenInfo.numScreens; i++)
1499+
{
1500+
pScreen = screenInfo.screens[i];
1501+
SetScreenPrivate (pScreen, NULL);
1502+
}
1503+
if (AttrType && SaverEventType && SuspendType &&
1504+
(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
1505+
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
1506+
NULL, StandardMinorOpcode)))
1507+
{
1508+
ScreenSaverEventBase = extEntry->eventBase;
1509+
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
1510+
}
1511+
}

‎Xext/shape.c

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,6 @@ static void SShapeNotifyEvent(
6868
* externally by the Xfixes extension and are now defined in window.h
6969
*/
7070

71-
static DISPATCH_PROC(ProcShapeCombine);
72-
static DISPATCH_PROC(ProcShapeDispatch);
73-
static DISPATCH_PROC(ProcShapeGetRectangles);
74-
static DISPATCH_PROC(ProcShapeInputSelected);
75-
static DISPATCH_PROC(ProcShapeMask);
76-
static DISPATCH_PROC(ProcShapeOffset);
77-
static DISPATCH_PROC(ProcShapeQueryExtents);
78-
static DISPATCH_PROC(ProcShapeQueryVersion);
79-
static DISPATCH_PROC(ProcShapeRectangles);
80-
static DISPATCH_PROC(ProcShapeSelectInput);
81-
static DISPATCH_PROC(SProcShapeCombine);
82-
static DISPATCH_PROC(SProcShapeDispatch);
83-
static DISPATCH_PROC(SProcShapeGetRectangles);
84-
static DISPATCH_PROC(SProcShapeInputSelected);
85-
static DISPATCH_PROC(SProcShapeMask);
86-
static DISPATCH_PROC(SProcShapeOffset);
87-
static DISPATCH_PROC(SProcShapeQueryExtents);
88-
static DISPATCH_PROC(SProcShapeQueryVersion);
89-
static DISPATCH_PROC(SProcShapeRectangles);
90-
static DISPATCH_PROC(SProcShapeSelectInput);
9171

9272
#ifdef PANORAMIX
9373
#include "panoramiX.h"
@@ -122,23 +102,6 @@ typedef struct _ShapeEvent {
122102
*
123103
****************/
124104

125-
void
126-
ShapeExtensionInit(void)
127-
{
128-
ExtensionEntry *extEntry;
129-
130-
ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient");
131-
ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent");
132-
if (ClientType && ShapeEventType &&
133-
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
134-
ProcShapeDispatch, SProcShapeDispatch,
135-
NULL, StandardMinorOpcode)))
136-
{
137-
ShapeEventBase = extEntry->eventBase;
138-
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
139-
}
140-
}
141-
142105
static int
143106
RegionOperate (
144107
ClientPtr client,
@@ -1278,3 +1241,20 @@ SProcShapeDispatch (ClientPtr client)
12781241
return BadRequest;
12791242
}
12801243
}
1244+
1245+
void
1246+
ShapeExtensionInit(void)
1247+
{
1248+
ExtensionEntry *extEntry;
1249+
1250+
ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient");
1251+
ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent");
1252+
if (ClientType && ShapeEventType &&
1253+
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
1254+
ProcShapeDispatch, SProcShapeDispatch,
1255+
NULL, StandardMinorOpcode)))
1256+
{
1257+
ShapeEventBase = extEntry->eventBase;
1258+
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
1259+
}
1260+
}

0 commit comments

Comments
 (0)