diff options
| author | Lutz Jänicke <jaenicke@openssl.org> | 2008-04-17 10:19:16 +0000 |
|---|---|---|
| committer | Lutz Jänicke <jaenicke@openssl.org> | 2008-04-17 10:19:16 +0000 |
| commit | 4c1a6e004a940a66c1d113ea3656a124e3dca1ea (patch) | |
| tree | 83046c2cd8ef940d621c2be052fa822c31730ee0 /util | |
| parent | 6e6ada18c626baf0215accb3a377f3b1c0e862c1 (diff) | |
Apply mingw patches as supplied by Roumen Petrov an Alon Bar-Lev
PR: 1552
Submitted by: Roumen Petrov <openssl@roumenpetrov.info>, "Alon Bar-Lev" <alon.barlev@gmail.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/mkerr.pl | 4 | ||||
| -rw-r--r-- | util/pl/BC-32.pl | 2 | ||||
| -rw-r--r-- | util/pl/Mingw32.pl | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/util/mkerr.pl b/util/mkerr.pl index aac87bbf3b..6004853bc1 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -377,6 +377,10 @@ foreach $lib (keys %csrc) "#ifndef HEADER_${lib}_ERR_H\n", "#define HEADER_${lib}_ERR_H\n", "\n", +"#ifdef __cplusplus\n", +"extern \"C\" {\n", +"#endif\n", +"\n", "/* BEGIN ERROR CODES */\n"; } open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n"; diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index 99b8c058d2..1f1e13fb40 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -117,7 +117,7 @@ ___ else { local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':''; - $ex.=' wsock32.lib gdi32.lib'; + $ex.=' ws2_32.lib gdi32.lib'; $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; } $ret.="\n"; diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl index b76b7afd27..fe3fb27a78 100644 --- a/util/pl/Mingw32.pl +++ b/util/pl/Mingw32.pl @@ -55,7 +55,7 @@ $link='${CC}'; $lflags='${CFLAGS}'; $efile='-o '; $exep=''; -$ex_libs="-lwsock32 -lgdi32"; +$ex_libs="-lws2_32 -lgdi32"; # static library stuff $mklib='ar r'; |