Skip to content

Commit e328410

Browse files
committed
Revert "Revert "Correct handling of dependent file paths on Windows (use winslash = "/")""
This reverts commit b6e5c0c.
1 parent b6e5c0c commit e328410

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-05-24 J.J. Allaire <[email protected]>
2+
3+
* src/attributes.cpp: Correct handling of dependent file paths on Windows (use winslash = "/")
4+
15
2016-04-13 Dirk Eddelbuettel <[email protected]>
26

37
* DESCRIPTION (Version): Rolling minor version and Date

inst/NEWS.Rd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
\itemize{
1515
\item R 3.3.0 Windows with Rtools 3.3 is now supported (Qin Wenfeng in PR
1616
\ghpr{451}).
17+
\item Correct handling of dependent file paths on Windows (use winslash = "/").
1718
}
1819
\item Changes in Rcpp Modules:
1920
\itemize{

src/attributes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ namespace attributes {
851851
// if it exists then normalize and add to our list
852852
LogicalVector exists = fileExists(include);
853853
if (exists[0]) {
854-
include = normalizePath(include);
854+
include = normalizePath(include, "/");
855855
if (addUniqueDependency(include, pDependencies)) {
856856
newDependencies.push_back(
857857
FileInfo(Rcpp::as<std::string>(include)));

0 commit comments

Comments
 (0)