summaryrefslogtreecommitdiffstats
path: root/winsup/mingw/include/_mingw.h
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2002-06-18 04:13:18 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2002-06-18 04:13:18 +0000
commit9fe2a2157b08beb8b96270a1a3a1663dad07f74b (patch)
treefbcec6cae38445626fda69d453c562a960aa145f /winsup/mingw/include/_mingw.h
parent6cde27195c7527fde31eb06a2025f67657e06150 (diff)
downloadcygnal-9fe2a2157b08beb8b96270a1a3a1663dad07f74b.tar.gz
cygnal-9fe2a2157b08beb8b96270a1a3a1663dad07f74b.tar.bz2
cygnal-9fe2a2157b08beb8b96270a1a3a1663dad07f74b.zip
2002-06-18 Casper S. Hornstrup <chorns@users.sourceforge.net>
* include/_mingw.h (__MINGW_IMPORT): Check for prior definition before defining. * include/excpt.h (): Include windef.h not windows.h. * include/fcntl.h (_O_SHORT_LIVED): Add define. (_chmod): Add prototype. (_creat): Correct prototype. (SH_DENY*): Rename defines to _SH_DENY*. (SH_DENY*): Add Non-ANSI names for _SH_DENY*. include/stdio.h (_IOMYBUF, _IOEOF, _IOERR, _IOSTRG, _IOAPPEND): Add defines. (_wfindfirst): Correct prototype. (_wfdopen): Add prototype. * include/stdlib.h (_rotl, _rotr, _lrotl, _lrotr): Add prototypes. * include/string.h (_mbschr, _mbstok, _mbsncat): Remove prototypes. (_wcsdup): Correct prototype. * include/mbstring.h: Remove comments about _mbschr, _mbstok, _mbsncat being in string.h. * include/wchar.h (_wfindfirst): Correct prototype. * include/tchar.h (_tfdopen): Add _UNICODE mappings.
Diffstat (limited to 'winsup/mingw/include/_mingw.h')
-rw-r--r--winsup/mingw/include/_mingw.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 0ee41f3fe..33b808d2a 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -44,13 +44,18 @@
style declarations. */
#ifndef __GNUC__
-# define __MINGW_IMPORT __declspec(dllimport)
+# ifndef __MINGW_IMPORT
+# define __MINGW_IMPORT __declspec(dllimport)
+# endif
# define __DECLSPEC_SUPPORTED
#else /* __GNUC__ */
# ifdef __declspec
+# ifndef __MINGW_IMPORT
+
/* Note the extern. This is needed to work around GCC's
limitations in handling dllimport attribute. */
-# define __MINGW_IMPORT extern __attribute__((dllimport))
+# define __MINGW_IMPORT extern __attribute__((dllimport))
+# endif
# define __DECLSPEC_SUPPORTED
# else
# undef __DECLSPEC_SUPPORTED