diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /xorg-server/include/os.h | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'xorg-server/include/os.h')
| -rw-r--r-- | xorg-server/include/os.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 578c5d894..642caeb99 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -563,7 +563,6 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X extern _X_EXPORT void VErrorF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0); extern SERVEXTERN void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); -extern _X_EXPORT void Error(const char *str); extern _X_EXPORT void LogPrintMarkers(void); extern _X_EXPORT void xorg_backtrace(void); |