summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/mingw/ChangeLog4
-rw-r--r--winsup/mingw/include/_mingw.h7
2 files changed, 9 insertions, 2 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 69a48f94a..8c2575c09 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-01 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/_mingw.h (_CRTIMP): Make conditional on __USE_CRTIMP.
+
2003-03-16 Danny Smith <dannysmith@users.sourceforge.net>
* mingwex/dirent.c (_topendir): Eliminate signed/unsigned warning.
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 439b5beaf..ad8dc29df 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -55,13 +55,16 @@
#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))
# endif
# ifndef _CRTIMP
-# define _CRTIMP __attribute__((dllimport))
+# ifdef __USE_CRTIMP
+# define _CRTIMP __attribute__((dllimport))
+# else
+# define _CRTIMP
+# endif
# endif
# define __DECLSPEC_SUPPORTED
# else /* __declspec */