diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 16:29:44 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 16:29:44 +0000 |
| commit | 1010f7d1107f4df30be4a6d97ddeead2d4f3e585 (patch) | |
| tree | a8ded6f98184a8a817412f1589109c8d88c9326c /base/path_service.h | |
| parent | 355cc27400bd3d128314f7203232cbb04c501cf2 (diff) | |
| download | chromium_src-1010f7d1107f4df30be4a6d97ddeead2d4f3e585.zip chromium_src-1010f7d1107f4df30be4a6d97ddeead2d4f3e585.tar.gz chromium_src-1010f7d1107f4df30be4a6d97ddeead2d4f3e585.tar.bz2 | |
Refactoring file_util into file_util and file_util_win. Also fix windows dependencies in path_service.cc.
One questionable decision here was to put GetCurrentDirectory and SetCurrentDirectory into file_util_win.cc. I could have kept the logic in path_service.cc with #ifdefs or I could have split up path_service.cc into path_service_win.cc, etc.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/path_service.h')
| -rw-r--r-- | base/path_service.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/base/path_service.h b/base/path_service.h index 861c9b5..e018516 100644 --- a/base/path_service.h +++ b/base/path_service.h @@ -30,6 +30,16 @@ #ifndef BASE_PATH_SERVICE_H__ #define BASE_PATH_SERVICE_H__ +#include "build/build_config.h" +#ifdef OS_WIN +// TODO(erikkay): this should be removable, but because SetCurrentDirectory +// is the name of a Windows function, it gets macro-ized to SetCurrentDirectoryW +// by windows.h, which leads to a different name in the header vs. the impl. +// Even if we could fix that, it would still hose all callers of the function. +// The right thing is likely to rename. +#include <windows.h> +#endif + #include <string> #include "base/base_paths.h" |