diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-02 19:50:24 +0100 |
| commit | 107e72b038bc76953dc97d4ea655c9bde10e5865 (patch) | |
| tree | a5c7cd9dc1857fd972683481fa39f6eba685b32e /nx-X11/lib/xtrans/transport.c | |
| parent | a9b145d466f774d0a6948a493df2e9c7bff50d6f (diff) | |
| parent | 6a186b9217e0e3ca10f285f90e5afcdd22dc6c2e (diff) | |
| download | nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.gz nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.tar.bz2 nx-libs-107e72b038bc76953dc97d4ea655c9bde10e5865.zip | |
Merge branch 'uli42-pr/upgrade_xtrans' into 3.6.x
Attributes GH PR #268: https://github.com/ArcticaProject/nx-libs/pull/268
Diffstat (limited to 'nx-X11/lib/xtrans/transport.c')
| -rw-r--r-- | nx-X11/lib/xtrans/transport.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/nx-X11/lib/xtrans/transport.c b/nx-X11/lib/xtrans/transport.c index e1a8b45ec..b62fc7b64 100644 --- a/nx-X11/lib/xtrans/transport.c +++ b/nx-X11/lib/xtrans/transport.c @@ -24,9 +24,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. -*/ - -/* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA + * Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * * All Rights Reserved * @@ -49,32 +47,28 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - -#ifdef XSERV_t -#include "os.h" -#else #include <stdlib.h> -#endif + +#define XTRANS_TRANSPORT_C /* used to flag Xtransint.h that it's being used + here, not just #included in another file */ #include "Xtransint.h" -#ifdef DNETCONN -#include "Xtransdnet.c" +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wformat-nonliteral" +#pragma clang diagnostic ignored "-Wdeprecated-declarations" #endif + #ifdef LOCALCONN #include "Xtranslcl.c" #endif -#ifdef OS2PIPECONN -#include "Xtransos2.c" -#endif #if defined(TCPCONN) || defined(UNIXCONN) #include "Xtranssock.c" #endif -#ifdef STREAMSCONN -#include "Xtranstli.c" -#endif #include "Xtrans.c" #include "Xtransutil.c" + +#ifdef __clang__ +#pragma clang diagnostic pop +#endif |