diff options
| author | Greg V <greg@unrelenting.technology> | 2018-06-27 18:07:01 +0300 |
|---|---|---|
| committer | Greg V <greg@unrelenting.technology> | 2018-06-27 18:07:01 +0300 |
| commit | 062cab58c19acb844375ea26fb3eb5841ad65545 (patch) | |
| tree | 30840912fe656c034bf2600669a8a76003bd5a00 | |
| parent | 671d31dc2e3b3a2812d98acb8fc0e5a26ec5e3c0 (diff) | |
| download | mrust-062cab58c19acb844375ea26fb3eb5841ad65545.tar.gz | |
Consistent preprocessor indentation in Builder constructor
That one '# ifdef __linux__' was sticking out
| -rw-r--r-- | tools/minicargo/build.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp index 20380a0d..ea93a793 100644 --- a/tools/minicargo/build.cpp +++ b/tools/minicargo/build.cpp @@ -544,12 +544,12 @@ Builder::Builder(BuildOptions opts): ::helpers::path minicargo_path { buf }; minicargo_path.pop_component(); -#ifdef __MINGW32__ +# ifdef __MINGW32__ m_compiler_path = (minicargo_path / "..\\..\\bin\\mrustc.exe").normalise(); -#else +# else // MSVC, minicargo and mrustc are in the same dir m_compiler_path = minicargo_path / "mrustc.exe"; -#endif +# endif #else char buf[1024]; # ifdef __linux__ @@ -559,7 +559,7 @@ Builder::Builder(BuildOptions opts): buf[s] = 0; } else -#elif defined(__APPLE__) +# elif defined(__APPLE__) uint32_t s = sizeof(buf); if( _NSGetExecutablePath(buf, &s) == 0 ) { @@ -567,7 +567,7 @@ Builder::Builder(BuildOptions opts): } else // TODO: Buffer too small -#elif defined(__FreeBSD__) || defined(__DragonFly__) || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) // NetBSD 8.0+ +# elif defined(__FreeBSD__) || defined(__DragonFly__) || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) // NetBSD 8.0+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t s = sizeof(buf); if ( sysctl(mib, 4, buf, &s, NULL, 0) == 0 ) @@ -575,9 +575,9 @@ Builder::Builder(BuildOptions opts): // Buffer populated } else -#else -# warning "Can't runtime determine path to minicargo" -#endif +# else +# warning "Can't runtime determine path to minicargo" +# endif { strcpy(buf, "tools/bin/minicargo"); } |