Please review.
We don't need emulation code of secapi for msvcr{90,100,110}.
                                          
From 87b25fc6191411342e5bfdc2ccbc66faa52105bd Mon Sep 17 00:00:00 2001
From: Yuta NAKAI <[email protected]>
Date: Fri, 13 Feb 2015 22:59:51 +0900
Subject: [PATCH] _sopen_s: The emulation code is only for msvcrt not for
 msvcr{90,100,110}.

---
 mingw-w64-crt/lib32/msvcr100.def.in         | 2 +-
 mingw-w64-crt/lib32/msvcr110.def.in         | 2 +-
 mingw-w64-crt/lib32/msvcr90.def.in          | 2 +-
 mingw-w64-crt/lib32/msvcr90d.def.in         | 2 +-
 mingw-w64-crt/lib64/msvcr100.def.in         | 2 +-
 mingw-w64-crt/lib64/msvcr110.def.in         | 2 +-
 mingw-w64-crt/lib64/msvcr90.def.in          | 2 +-
 mingw-w64-crt/lib64/msvcr90d.def.in         | 2 +-
 mingw-w64-crt/libarm32/msvcr110.def         | 2 +-
 mingw-w64-crt/libarm32/msvcr120_clr0400.def | 2 +-
 mingw-w64-headers/crt/io.h                  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-crt/lib32/msvcr100.def.in 
b/mingw-w64-crt/lib32/msvcr100.def.in
index 2472320..a1d7447 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in
@@ -1344,7 +1344,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib32/msvcr110.def.in 
b/mingw-w64-crt/lib32/msvcr110.def.in
index d9854dc..f9f0294 100644
--- a/mingw-w64-crt/lib32/msvcr110.def.in
+++ b/mingw-w64-crt/lib32/msvcr110.def.in
@@ -1477,7 +1477,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in 
b/mingw-w64-crt/lib32/msvcr90.def.in
index 7d8ef3c..394d7f5 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -978,7 +978,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in 
b/mingw-w64-crt/lib32/msvcr90d.def.in
index a3f587a..8846e13 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -1042,7 +1042,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib64/msvcr100.def.in 
b/mingw-w64-crt/lib64/msvcr100.def.in
index 384fc64..a3ba8cd 100644
--- a/mingw-w64-crt/lib64/msvcr100.def.in
+++ b/mingw-w64-crt/lib64/msvcr100.def.in
@@ -1292,7 +1292,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib64/msvcr110.def.in 
b/mingw-w64-crt/lib64/msvcr110.def.in
index 65f3122..6e8a487 100644
--- a/mingw-w64-crt/lib64/msvcr110.def.in
+++ b/mingw-w64-crt/lib64/msvcr110.def.in
@@ -1416,7 +1416,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib64/msvcr90.def.in 
b/mingw-w64-crt/lib64/msvcr90.def.in
index 5fd5749..7b74907 100644
--- a/mingw-w64-crt/lib64/msvcr90.def.in
+++ b/mingw-w64-crt/lib64/msvcr90.def.in
@@ -912,7 +912,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in 
b/mingw-w64-crt/lib64/msvcr90d.def.in
index 1454d29..4649135 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def.in
+++ b/mingw-w64-crt/lib64/msvcr90d.def.in
@@ -970,7 +970,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/libarm32/msvcr110.def 
b/mingw-w64-crt/libarm32/msvcr110.def
index c22973f..40a4093 100644
--- a/mingw-w64-crt/libarm32/msvcr110.def
+++ b/mingw-w64-crt/libarm32/msvcr110.def
@@ -1065,7 +1065,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-crt/libarm32/msvcr120_clr0400.def 
b/mingw-w64-crt/libarm32/msvcr120_clr0400.def
index c3232e9..32d7965 100644
--- a/mingw-w64-crt/libarm32/msvcr120_clr0400.def
+++ b/mingw-w64-crt/libarm32/msvcr120_clr0400.def
@@ -1064,7 +1064,7 @@ _snwscanf_l
 _snwscanf_s
 _snwscanf_s_l
 _sopen
-; _sopen_s replaced by emu
+_sopen_s
 _spawnl
 _spawnle
 _spawnlp
diff --git a/mingw-w64-headers/crt/io.h b/mingw-w64-headers/crt/io.h
index 871b8dc..c61e94a 100644
--- a/mingw-w64-headers/crt/io.h
+++ b/mingw-w64-headers/crt/io.h
@@ -275,7 +275,7 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 #endif /* _UWIN */
 #endif /* Not NO_OLDNAMES */
 
-  errno_t __cdecl _sopen_s(int *_FileHandle,const char *_Filename,int 
_OpenFlag,int _ShareFlag,int _PermissionMode);
+  _CRTIMP errno_t __cdecl _sopen_s(int *_FileHandle,const char *_Filename,int 
_OpenFlag,int _ShareFlag,int _PermissionMode);
 
   _CRTIMP int __cdecl _open(const char *_Filename,int _OpenFlag,...) 
__MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   _CRTIMP int __cdecl _sopen(const char *_Filename,int _OpenFlag,int 
_ShareFlag,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
-- 
2.3.0

------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to