From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 14 May 2021 22:40:58 +0000 (-0700)
Subject: sfio: remove uwin specific handling
X-Git-Tag: 2.47.2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37f7a02ac4865953868a00c9216d59ec0640dc56;p=graphviz

sfio: remove uwin specific handling

The indirection of the data through the IAT is implicitly handled by
modern linkers and compilers when the data symbol is annotated with
`__declspec(dll{import,export})`.  This removes the support for the
older toolchains as part of the work to properly annotate symbols for
improvements to the Windows port.
---

diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h
index a4a0f60a8..89a8bee03 100644
--- a/lib/sfio/sfio.h
+++ b/lib/sfio/sfio.h
@@ -272,15 +272,6 @@ extern "C" {
     EXTERN extern Sfio_t _Sfstderr;
 #undef EXTERN
 
-#if defined(_DLL) && defined(_DLL_INDIRECT_DATA)
-/* The Uwin shared library environment requires these to be defined
-   in a global structure set up by the Uwin start-up procedure.
-*/
-#define sfstdin		((Sfio_t*)_ast_dll->_ast_stdin)
-#define sfstdout	((Sfio_t*)_ast_dll->_ast_stdout)
-#define sfstderr	((Sfio_t*)_ast_dll->_ast_stderr)
-#endif
-
 
     extern Sfio_t *sfnew(Sfio_t *, void *, size_t, int, int);
     extern Sfio_t *sfopen(Sfio_t *, const char *, const char *);