diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-07-07 14:13:46 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-07-07 14:13:46 +0200 |
| commit | 5ad4d06006e96b1c7ff663ffcd5e406e06bae1c2 (patch) | |
| tree | 659c6081230675758edcfb66a394fc1aa3e1bacb /common/rdr | |
| parent | 890c10118c8a0db4fddb53a161f207c6ad23c130 (diff) | |
| download | tigervnc-5ad4d06006e96b1c7ff663ffcd5e406e06bae1c2.tar.gz tigervnc-5ad4d06006e96b1c7ff663ffcd5e406e06bae1c2.zip | |
Remove a lot of platform compatibilty stuff
It's either not used, or no longer relevant.
Diffstat (limited to 'common/rdr')
| -rw-r--r-- | common/rdr/Exception.cxx | 5 | ||||
| -rw-r--r-- | common/rdr/ZlibOutStream.cxx | 3 | ||||
| -rw-r--r-- | common/rdr/msvcwarning.h | 26 |
3 files changed, 5 insertions, 29 deletions
diff --git a/common/rdr/Exception.cxx b/common/rdr/Exception.cxx index fd40582f..d70cd9fc 100644 --- a/common/rdr/Exception.cxx +++ b/common/rdr/Exception.cxx @@ -22,6 +22,9 @@ #include <config.h> #endif +#include <stdio.h> +#include <stdarg.h> + #include <rdr/Exception.h> #include <rdr/TLSException.h> #ifdef _WIN32 @@ -30,8 +33,6 @@ #include <windows.h> #endif -#include <os/print.h> - #include <string.h> #ifdef HAVE_GNUTLS diff --git a/common/rdr/ZlibOutStream.cxx b/common/rdr/ZlibOutStream.cxx index 260bd1a4..9d9f8ba1 100644 --- a/common/rdr/ZlibOutStream.cxx +++ b/common/rdr/ZlibOutStream.cxx @@ -17,9 +17,10 @@ * USA. */ +#include <stdio.h> + #include <rdr/ZlibOutStream.h> #include <rdr/Exception.h> -#include <os/print.h> #include <zlib.h> diff --git a/common/rdr/msvcwarning.h b/common/rdr/msvcwarning.h deleted file mode 100644 index bea8d3f4..00000000 --- a/common/rdr/msvcwarning.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -// Trim out extraneous cruft from windows.h includes -#define WIN32_LEAN_AND_MEAN - -// Force all Windows NT-specific APIs to be visible -#define _WIN32_WINNT 0xffff - -#pragma warning( disable : 4800 ) // forcing bool 'true' or 'false' -#pragma warning( disable : 4786 ) // truncating debug information to 255 chars
\ No newline at end of file |