cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2718 from ethereum/globals

Browse Source 
Remove some global symbols
This commit is contained in:
chriseth 2017-08-09 14:53:24 +02:00 committed by GitHub
commit 4b0ea1fba0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solc/jsonCompiler.cpp
View File

@ -38,6 +38,9 @@ extern "C" {
typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error); typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error);
} }
namespace
{
ReadFile::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullptr) ReadFile::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullptr)
{ {
ReadFile::Callback readCallback; ReadFile::Callback readCallback;
@ -260,6 +263,8 @@ string compileStandardInternal(string const& _input, CStyleReadFileCallback _rea
return compiler.compile(_input); return compiler.compile(_input);
} }
}
static string s_outputBuffer; static string s_outputBuffer;
extern "C" extern "C"

2
solc/main.cpp
View File

@ -40,7 +40,7 @@ specified default locale if it is valid, and if not then it will modify the
environment the process is running in to use a sensible default. This also means environment the process is running in to use a sensible default. This also means
that users do not need to install language packs for their OS. that users do not need to install language packs for their OS.
*/ */
void setDefaultOrCLocale() static void setDefaultOrCLocale()
{ {
#if __unix__ #if __unix__
if (!std::setlocale(LC_ALL, "")) if (!std::setlocale(LC_ALL, ""))