summaryrefslogtreecommitdiff
path: root/include/os.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
commit2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree07262cbe15a40e5aeae54f62751260f83243ab79 /include/os.h
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'include/os.h')
-rw-r--r--include/os.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/os.h b/include/os.h
index e9328c8fa..b553e06e1 100644
--- a/include/os.h
+++ b/include/os.h
@@ -231,6 +231,8 @@ extern SIGVAL GiveUp(int /*sig*/);
extern void UseMsg(void);
+extern void InitGlobals(void);
+
extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
extern int set_font_authorizations(
@@ -333,7 +335,7 @@ extern int GetHosts(
typedef struct sockaddr * sockaddrPtr;
-extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/);
+extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
extern int LocalClient(ClientPtr /* client */);
@@ -412,6 +414,8 @@ extern XID GenerateAuthorization(
extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
#endif
+extern void ddxInitGlobals(void);
+
extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
extern void ddxUseMsg(void);