aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/os.h
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/include/os.h')
-rw-r--r--xorg-server/include/os.h38
1 files changed, 27 insertions, 11 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index e5f86d67d..eac227475 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -121,6 +121,8 @@ extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
extern _X_EXPORT void ResetOsBuffers(void);
+extern _X_EXPORT int TransIsListening(char *protocol);
+
extern _X_EXPORT void InitConnectionLimits(void);
extern _X_EXPORT void NotifyParentProcess(void);
@@ -140,7 +142,7 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
char * /*auth_string */ );
extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ ,
- void */*closure */ );
+ void * /*closure */ );
extern _X_EXPORT void CheckConnections(void);
@@ -173,14 +175,14 @@ extern void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void);
-extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ ,
+extern _X_EXPORT void AdjustWaitForDelay(void * /*waitTime */ ,
unsigned long /*newdelay */ );
typedef struct _OsTimerRec *OsTimerPtr;
typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ ,
CARD32 /* time */ ,
- void */* arg */ );
+ void * /* arg */ );
extern _X_EXPORT void TimerInit(void);
@@ -193,7 +195,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ ,
int /* flags */ ,
CARD32 /* millis */ ,
OsTimerCallback /* func */ ,
- void */* arg */ );
+ void * /* arg */ );
extern _X_EXPORT void TimerCheck(void);
extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
@@ -212,7 +214,7 @@ extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []);
extern _X_EXPORT int set_font_authorizations(char ** /* authorizations */ ,
int * /*authlen */ ,
- void */* client */ );
+ void * /* client */ );
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
@@ -395,14 +397,14 @@ ForEachHostInFamily(int /*family */ ,
Bool (* /*func */ )(
unsigned char * /* addr */ ,
short /* len */ ,
- void */* closure */ ),
- void */*closure */ );
+ void * /* closure */ ),
+ void * /*closure */ );
extern _X_EXPORT int
RemoveHost(ClientPtr /*client */ ,
int /*family */ ,
unsigned /*length */ ,
- void */*pAddr */ );
+ void * /*pAddr */ );
extern _X_EXPORT int
GetHosts(void ** /*data */ ,
@@ -460,11 +462,11 @@ extern _X_EXPORT void
AccessUsingXdmcp(void);
extern _X_EXPORT void
-DefineSelf(int /*fd */ );
+DefineSelf(int /*fd */ , const int /*protocol*/);
#if XDMCP
extern _X_EXPORT void
-AugmentSelf(void */*from */ , int /*len */ );
+AugmentSelf(void * /*from */ , int /*len */ );
extern _X_EXPORT void
RegisterAuthorizations(void);
@@ -668,10 +670,20 @@ _X_ATTRIBUTE_PRINTF(1, 2)
#define DebugF(...) /* */
#endif
+#ifdef _MSC_VER
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
+#else
+#define SERVEXTERN _declspec(dllexport)
+#endif
+#else
+#define SERVEXTERN _X_EXPORT
+#endif
+
extern _X_EXPORT void
VErrorF(const char *f, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0);
-extern _X_EXPORT void
+extern SERVEXTERN void
ErrorF(const char *f, ...)
_X_ATTRIBUTE_PRINTF(1, 2);
extern _X_EXPORT void
@@ -686,6 +698,10 @@ LogPrintMarkers(void);
extern _X_EXPORT void
xorg_backtrace(void);
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
extern _X_EXPORT int
os_move_fd(int fd);