summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/Xserver.man.pre3
-rw-r--r--include/cursor.h23
-rw-r--r--include/dix.h48
-rw-r--r--include/extnsionst.h49
-rw-r--r--include/input.h10
-rw-r--r--include/os.h64
-rw-r--r--include/regionstr.h6
-rw-r--r--include/resource.h25
-rw-r--r--include/scrnintstr.h20
-rw-r--r--os/auth.c3
-rw-r--r--os/connection.c7
-rw-r--r--os/xdmcp.c4
-rw-r--r--xkb/ddxFakeMtn.c8
-rw-r--r--xkb/xkbUtils.c4
14 files changed, 49 insertions, 225 deletions
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 934c62192..972280ba0 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -709,9 +709,6 @@ Bitmap font directories
.TP 30
.IR __projectroot__/lib/X11/fonts/Speedo , __projectroot__/lib/X11/fonts/Type1
Outline font directories
-.\" .TP 30
-.\" __projectroot__/lib/X11/fonts/PEX
-.\" PEX font directories
.TP 30
.I __projectroot__/lib/X11/rgb.txt
Color database
diff --git a/include/cursor.h b/include/cursor.h
index 80fb9e715..7509a94af 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -97,21 +97,6 @@ extern CursorPtr AllocCursorARGB(
unsigned /*backGreen*/,
unsigned /*backBlue*/);
-extern CursorPtr AllocCursorARGB(
-#if NeedFunctionPrototypes
- unsigned char* /*psrcbits*/,
- unsigned char* /*pmaskbits*/,
- CARD32* /*argb*/,
- CursorMetricPtr /*cm*/,
- unsigned /*foreRed*/,
- unsigned /*foreGreen*/,
- unsigned /*foreBlue*/,
- unsigned /*backRed*/,
- unsigned /*backGreen*/,
- unsigned /*backBlue*/
-#endif
-);
-
extern int AllocGlyphCursor(
Font /*source*/,
unsigned int /*sourceChar*/,
@@ -159,12 +144,4 @@ extern void GetSpritePosition(
extern int XineramaGetCursorScreen(void);
#endif /* PANORAMIX */
-#ifdef PANORAMIX
-extern int XineramaGetCursorScreen(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-#endif /* PANORAMIX */
-
#endif /* CURSOR_H */
diff --git a/include/dix.h b/include/dix.h
index c0e7a0fe3..a47bfd8cc 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -372,36 +372,6 @@ extern int DoGetImage(
extern void IncrementClientCount(void);
#endif /* LBX */
-extern int SendConnSetup(
-#if NeedFunctionPrototypes
- ClientPtr /*client*/,
- char* /*reason*/
-#endif
-);
-
-extern int
-DoGetImage(
-#if NeedFunctionPrototypes
- ClientPtr /*client*/,
- int /*format*/,
- Drawable /*drawable*/,
- int /*x*/,
- int /*y*/,
- int /*width*/,
- int /*height*/,
- Mask /*planemask*/,
- xGetImageReply **/*im_return*/
-#endif
-);
-
-#ifdef LBX
-extern void IncrementClientCount(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-#endif /* LBX */
-
/* dixutils.c */
extern void CopyISOLatin1Lowered(
@@ -490,12 +460,6 @@ extern void ProcessWorkQueue(void);
extern void ProcessWorkQueueZombies(void);
-extern void ProcessWorkQueueZombies(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
extern Bool QueueWorkProc(
Bool (* /*function*/)(
ClientPtr /*clientUnused*/,
@@ -647,15 +611,6 @@ extern void FixKeyState(
DeviceIntPtr /* keybd */);
#endif /* XKB */
-#ifdef XKB
-extern void FixKeyState(
-#if NeedFunctionPrototypes
- xEvent * /* xE */,
- DeviceIntPtr /* keybd */
-#endif
-);
-#endif /* XKB */
-
extern void RecalculateDeliverableEvents(
WindowPtr /* pWin */);
@@ -692,8 +647,6 @@ extern void InitEvents(void);
extern void CloseDownEvents(void);
-extern void CloseDownEvents(void);
-
extern void DeleteWindowFromAnyEvents(
WindowPtr /* pWin */,
Bool /* freeResources */);
@@ -712,7 +665,6 @@ extern int DeliverEvents(
WindowPtr /*otherParent*/);
-
extern void WriteEventsToClient(
ClientPtr /*pClient*/,
int /*count*/,
diff --git a/include/extnsionst.h b/include/extnsionst.h
index b73b52519..0d7debe0b 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -1,3 +1,50 @@
+/* $Xorg: extnsionst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
+/***********************************************************
+
+Copyright 1987, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */
#ifndef EXTENSIONSTRUCT_H
@@ -83,8 +130,6 @@ extern Bool AddExtensionAlias(
extern ExtensionEntry *CheckExtension(const char *extname);
-extern ExtensionEntry *CheckExtension(const char *extname);
-
extern ExtensionLookupProc LookupProc(
char* /*name*/,
GCPtr /*pGC*/);
diff --git a/include/input.h b/include/input.h
index 659b60bfe..acf3bca1a 100644
--- a/include/input.h
+++ b/include/input.h
@@ -160,16 +160,6 @@ extern DeviceIntPtr _AddInputDevice(
DeviceProc /*deviceProc*/,
Bool /*autoStart*/);
-#define AddInputDevice(deviceProc, autoStart) \
- _AddInputDevice(deviceProc, autoStart)
-
-extern DeviceIntPtr _AddInputDevice(
-#if NeedFunctionPrototypes
- DeviceProc /*deviceProc*/,
- Bool /*autoStart*/
-#endif
-);
-
extern Bool EnableDevice(
DeviceIntPtr /*device*/);
diff --git a/include/os.h b/include/os.h
index 25b06f297..e9328c8fa 100644
--- a/include/os.h
+++ b/include/os.h
@@ -266,24 +266,6 @@ extern void LockServer(void);
extern void UnlockServer(void);
#endif
-#if NeedVarargsPrototypes
-extern void VErrorF(const char *f, va_list args);
-#endif
-
-#ifdef SERVER_LOCK
-extern void LockServer(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
-extern void UnlockServer(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-#endif
-
extern int OsLookupColor(
int /*screen*/,
char * /*name*/,
@@ -323,31 +305,6 @@ extern int Fclose(pointer);
extern void CheckUserParameters(int argc, char **argv, char **envp);
extern void CheckUserAuthorization(void);
-void OsBlockSignals (
-#if NeedFunctionPrototypes
- void
-#endif
- );
-
-void OsReleaseSignals (
-#if NeedFunctionPrototypes
- void
-#endif
- );
-
-#if !defined(WIN32) && !defined(__UNIXOS2__)
-extern int System(char *);
-extern pointer Popen(char *, char *);
-extern int Pclose(pointer);
-#else
-#define System(a) system(a)
-#define Popen(a,b) popen(a,b)
-#define Pclose(a) pclose(a)
-#endif
-
-extern void CheckUserParameters(int argc, char **argv, char **envp);
-extern void CheckUserAuthorization(void);
-
extern int AddHost(
ClientPtr /*client*/,
int /*family*/,
@@ -420,19 +377,6 @@ extern int AuthorizationFromID (
unsigned short *data_lenp,
char **datap);
-extern XID AuthorizationToID (
- unsigned short name_length,
- char *name,
- unsigned short data_length,
- char *data);
-
-extern int AuthorizationFromID (
- XID id,
- unsigned short *name_lenp,
- char **namep,
- unsigned short *data_lenp,
- char **datap);
-
extern XID CheckAuthorization(
unsigned int /*namelength*/,
char * /*name*/,
@@ -450,12 +394,6 @@ extern int RemoveAuthorization (
unsigned short data_length,
char *data);
-extern int RemoveAuthorization (
- unsigned short name_length,
- char *name,
- unsigned short data_length,
- char *data);
-
extern int AddAuthorization(
unsigned int /*name_length*/,
char * /*name*/,
@@ -478,8 +416,6 @@ extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
extern void ddxUseMsg(void);
-extern void ddxUseMsg(void);
-
/*
* idiom processing stuff
*/
diff --git a/include/regionstr.h b/include/regionstr.h
index 5754e5333..b431d0b04 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -381,12 +381,6 @@ extern void miRegionReset(
extern Bool miRegionBreak(
RegionPtr /*pReg*/);
-extern Bool miRegionBreak(
-#if NeedFunctionPrototypes
- RegionPtr /*pReg*/
-#endif
-);
-
extern Bool miPointInRegion(
RegionPtr /*pReg*/,
int /*x*/,
diff --git a/include/resource.h b/include/resource.h
index 0408f0400..6517ab212 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -188,14 +188,6 @@ extern void FindAllClientResources(
FindAllRes /*func*/,
pointer /*cdata*/);
-extern void FindAllClientResources(
-#if NeedFunctionPrototypes
- ClientPtr /*client*/,
- FindAllRes /*func*/,
- pointer /*cdata*/
-#endif
-);
-
extern void FreeClientNeverRetainResources(
ClientPtr /*client*/);
@@ -222,15 +214,6 @@ extern pointer LookupClientResourceComplex(
FindComplexResType func,
pointer cdata);
-extern pointer LookupClientResourceComplex(
-#if NeedFunctionPrototypes
- ClientPtr client,
- RESTYPE type,
- FindComplexResType func,
- pointer cdata
-#endif
-);
-
/* These are the access modes that can be passed in the last parameter
* to SecurityLookupIDByType/Class. The Security extension doesn't
* currently make much use of these; they're mainly provided as an
@@ -287,13 +270,5 @@ extern Atom *ResourceNames;
void RegisterResourceName(RESTYPE type, char* name);
#endif
-extern RESTYPE lastResourceType;
-extern RESTYPE TypeMask;
-
-#ifdef XResExtension
-extern Atom *ResourceNames;
-void RegisterResourceName(RESTYPE type, char* name);
-#endif
-
#endif /* RESOURCE_H */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 2e9b19c8b..0f1813c00 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -323,8 +323,6 @@ typedef void (* ResolveColorProcPtr)(
#ifdef NEED_SCREEN_REGIONS
-#ifdef NEED_SCREEN_REGIONS
-
typedef RegionPtr (* RegionCreateProcPtr)(
BoxPtr /*rect*/,
int /*size*/);
@@ -396,18 +394,6 @@ typedef Bool (* RegionBrokenProcPtr)(
typedef Bool (* RegionBreakProcPtr)(
RegionPtr /*pReg*/);
-typedef Bool (* RegionBrokenProcPtr)(
-#if NeedNestedPrototypes
- RegionPtr /*pReg*/
-#endif
-);
-
-typedef Bool (* RegionBreakProcPtr)(
-#if NeedNestedPrototypes
- RegionPtr /*pReg*/
-#endif
-);
-
typedef void (* RegionEmptyProcPtr)(
RegionPtr /*pReg*/);
@@ -424,15 +410,11 @@ typedef Bool (* RegionValidateProcPtr)(
#endif /* NEED_SCREEN_REGIONS */
-#endif /* NEED_SCREEN_REGIONS */
-
typedef RegionPtr (* BitmapToRegionProcPtr)(
PixmapPtr /*pPix*/);
#ifdef NEED_SCREEN_REGIONS
-#ifdef NEED_SCREEN_REGIONS
-
typedef RegionPtr (* RectsToRegionProcPtr)(
int /*nrects*/,
xRectangle* /*prect*/,
@@ -440,8 +422,6 @@ typedef RegionPtr (* RectsToRegionProcPtr)(
#endif /* NEED_SCREEN_REGIONS */
-#endif /* NEED_SCREEN_REGIONS */
-
typedef void (* SendGraphicsExposeProcPtr)(
ClientPtr /*client*/,
RegionPtr /*pRgn*/,
diff --git a/os/auth.c b/os/auth.c
index 30ba8a5a1..a1cbc8c1f 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -135,9 +135,6 @@ LoadAuthorization (void)
Xauth *auth;
int i;
int count = 0;
-#if !defined(WIN32) && !defined(__UNIXOS2__)
- char *buf;
-#endif
ShouldLoadAuth = FALSE;
if (!authorization_file)
diff --git a/os/connection.c b/os/connection.c
index 10308f3f6..7465e7eff 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -186,7 +186,6 @@ Bool AnyClientsWriteBlocked; /* true if some client blocked on write */
Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
Bool PartialNetwork; /* continue even if unable to bind all addrs */
-char *protNoListen; /* don't listen on this protocol */
static Pid_t ParentProcess;
#ifdef __UNIXOS2__
Pid_t GetPPID(Pid_t pid);
@@ -326,12 +325,6 @@ CreateWellKnownSockets(void)
sprintf (port, "%d", atoi (display));
- if (protNoListen)
- if (_XSERVTransNoListen(protNoListen))
- {
- FatalError ("Failed to disable listen for %s", protNoListen);
- }
-
if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial,
&ListenTransCount, &ListenTransConns) >= 0) &&
(ListenTransCount >= 1))
diff --git a/os/xdmcp.c b/os/xdmcp.c
index d901a80e8..43af268e4 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -289,10 +289,6 @@ XdmcpOptions(int argc, char **argv, int i)
get_fromaddr_by_name(argc, argv, ++i);
return (i + 1);
}
- if (strcmp(argv[i], "-from") == 0) {
- get_fromaddr_by_name(argc, argv, ++i);
- return (i + 1);
- }
if (strcmp(argv[i], "-once") == 0) {
OneSession = TRUE;
return (i + 1);
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 8d6079d09..289fa3bfb 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -45,14 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "mipointer.h"
#include "mipointrst.h"
-extern void NewCurrentScreen(
-#if NeedFunctionPrototypes
- ScreenPtr /* newScreen */,
- int /* x */,
- int /* y */
-#endif
-);
-
void
XkbDDXFakePointerMotion(unsigned flags,int x,int y)
{
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 208dcb1eb..f3ba6bc17 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -746,11 +746,11 @@ unsigned char grp;
grp= state->locked_group;
- if ((grp>=ctrls->num_groups) || (grp<0))
+ if (grp>=ctrls->num_groups)
state->locked_group= XkbAdjustGroup(grp,ctrls);
grp= state->locked_group+state->base_group+state->latched_group;
- if ((grp>=ctrls->num_groups) || (grp<0))
+ if (grp>=ctrls->num_groups)
state->group= XkbAdjustGroup(grp,ctrls);
else state->group= grp;
XkbComputeCompatState(xkbi);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 01:31:38 +0000