aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/os.h
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/include/os.h')
-rwxr-xr-x[-rw-r--r--]xorg-server/include/os.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 3e68c4933..cee8f3c90 100644..100755
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -117,6 +117,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);
@@ -422,7 +424,7 @@ 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
@@ -630,10 +632,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
@@ -648,6 +660,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);