Revert "Merge pull request #1317 from pullreq/cpp"

This reverts commit 74135c0600, reversing
changes made to 6d749789ce.

See discussion in #1317
This commit is contained in:
ridiculousfish
2014-02-28 02:15:24 -08:00
parent 858b6aa257
commit be33d3f2a4
60 changed files with 95 additions and 103 deletions

View File

@@ -1,6 +1,3 @@
/** \file fish.cpp
The main loop of fish.
*/
/*
Copyright (C) 2005-2008 Axel Liljencrantz
@@ -18,6 +15,11 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/** \file fish.c
The main loop of <tt>fish</tt>.
*/
#include "config.h"
@@ -211,6 +213,8 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
paths.sysconf = L"" SYSCONFDIR "/fish";
paths.doc = L"" DOCDIR;
paths.bin = L"" BINDIR;
done = true;
}
return paths;