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.h22
1 files changed, 19 insertions, 3 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index b489211ab..642caeb99 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -115,6 +115,8 @@ extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void*
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);
@@ -327,7 +329,7 @@ extern _X_EXPORT int AddHost(
ClientPtr /*client*/,
int /*family*/,
unsigned /*length*/,
- const void */*pAddr*/);
+ const void * /*pAddr*/);
extern _X_EXPORT Bool ForEachHostInFamily (
int /*family*/,
@@ -390,7 +392,7 @@ extern _X_EXPORT void DisableLocalHost(void);
extern _X_EXPORT void AccessUsingXdmcp(void);
-extern _X_EXPORT void DefineSelf(int /*fd*/);
+extern _X_EXPORT void DefineSelf(int /*fd*/, const int /*protocol*/);
#if XDMCP
extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);
@@ -549,10 +551,24 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X
#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 ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern SERVEXTERN void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern _X_EXPORT void LogPrintMarkers(void);
extern _X_EXPORT void xorg_backtrace(void);
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
#endif /* OS_H */