Merge branch 'master' of github.com:rstudio/rstudio

rstudio · Dec 14, 2011 · f3b1416 · f3b1416
2 parents 8a021bf + e347d6c
commit f3b1416
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
@@ -179,11 +179,9 @@ core::ProgramStatus Options::read(int argc, char * const argv[])
       ("external-rpostback-path", 
        value<std::string>(&rpostbackPath_)->default_value("bin/postback/rpostback"),
        "Path to rpostback executable")
-#ifdef _WIN32
       ("external-consoleio-path",
        value<std::string>(&consoleIoPath_)->default_value("bin/consoleio.exe"),
        "Path to consoleio executable")
-#endif
       ;
 
    // user options (default user identity to current username)

diff --git a/src/cpp/session/include/session/SessionOptions.hpp b/src/cpp/session/include/session/SessionOptions.hpp
@@ -178,12 +178,10 @@ class Options : boost::noncopyable
       return core::FilePath(rpostbackPath_.c_str());
    }
 
-#ifdef _WIN32
    core::FilePath consoleIoPath() const
    {
       return core::FilePath(consoleIoPath_.c_str());
    }
-#endif
 
    // user info
    std::string userIdentity() const 
@@ -297,9 +295,7 @@ class Options : boost::noncopyable
 
    // external
    std::string rpostbackPath_;
-#ifdef _WIN32
    std::string consoleIoPath_;
-#endif
 
    // user info
    std::string userIdentity_;