There were some discussions about recent libstdc++ breackage, but I
didn't see any fix committed, so here is my proposal. The first patch is
just about doing (read: breaking) things in the right place instead of a
random unrelated header. Please review.
Signed-off-by: Jacek Caban <[email protected]>
---
mingw-w64-headers/include/driverspecs.h | 16 ----------------
mingw-w64-headers/include/sal.h | 13 +++++++++++++
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/mingw-w64-headers/include/driverspecs.h b/mingw-w64-headers/include/driverspecs.h
index 2fa89a1d..ad39a93f 100644
--- a/mingw-w64-headers/include/driverspecs.h
+++ b/mingw-w64-headers/include/driverspecs.h
@@ -12,22 +12,6 @@
#define __drv_dispatchType(x)
#define __drv_dispatchType_other
-/*
- * FIXME: These annotations are not driver-only and does not belong here
- */
-#define __in
-#define __in_bcount(Size)
-#define __in_ecount(Size)
-
-#define __out
-#define __out_bcount(Size)
-#define __out_bcount_part(Size, Length)
-#define __out_ecount(Size)
-
-#define __inout
-
-#define __deref_out_ecount(Size)
-
#define __drv_aliasesMem
#define __drv_allocatesMem(kind)
#define __drv_freesMem(kind)
diff --git a/mingw-w64-headers/include/sal.h b/mingw-w64-headers/include/sal.h
index 5c200d49..8542a175 100644
--- a/mingw-w64-headers/include/sal.h
+++ b/mingw-w64-headers/include/sal.h
@@ -207,5 +207,18 @@
#define _Analysis_assume_(expr)
#define _Analysis_assume_nullterminated_(expr)
+#define __in
+#define __in_bcount(size)
+#define __in_ecount(size)
+
+#define __out
+#define __out_bcount(size)
+#define __out_bcount_part(size, length)
+#define __out_ecount(size)
+
+#define __inout
+
+#define __deref_out_ecount(size)
+
#endif
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
