#5145 , rename port/dirent.h to port/port_dirent.h to avoid compile e…

…rr when use port dir as header dir output (#5152) Summary: mv port/dirent.h to port/port_dirent.h to avoid compile err when use port dir as header dir output Pull Request resolved: #5152 Differential Revision: D14779409 Pulled By: siying fbshipit-source-id: d4162c47c979c6e8cc6a9e601802864ab3768ecb
facebook · Apr 4, 2019 · f0edf9d · f0edf9d
1 parent 75e8b6d
commit f0edf9d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/WINDOWS_PORT.md b/WINDOWS_PORT.md
@@ -43,7 +43,7 @@ We plan to use this port for our business purposes here at Bing and this provide
 
 * Certain headers that are not present and not necessary on Windows were simply `#ifndef OS_WIN` in a few places (`unistd.h`)
 * All posix specific headers were replaced to port/port.h which worked well
-* Replaced `dirent.h` for `port/dirent.h` (very few places) with the implementation of the relevant interfaces within `rocksdb::port` namespace
+* Replaced `dirent.h` for `port/port_dirent.h` (very few places) with the implementation of the relevant interfaces within `rocksdb::port` namespace
 * Replaced `sys/time.h` to `port/sys_time.h` (few places) implemented equivalents within `rocksdb::port`
 * `printf %z` specification is not supported on Windows. To imitate existing standards we came up with a string macro `ROCKSDB_PRIszt` which expands to `zu` on posix systems and to `Iu` on windows.
 * in class member initialization were moved to a __ctors in some cases

diff --git a/port/dirent.h → port/port_dirent.h b/port/dirent.h → port/port_dirent.h
diff --git a/port/win/env_win.cc b/port/win/env_win.cc
@@ -24,7 +24,7 @@
 #include "rocksdb/slice.h"
 
 #include "port/port.h"
-#include "port/dirent.h"
+#include "port/port_dirent.h"
 #include "port/win/win_logger.h"
 #include "port/win/io_win.h"
 

diff --git a/port/win/port_win.cc b/port/win/port_win.cc
@@ -14,7 +14,7 @@
 #include "port/win/port_win.h"
 
 #include <io.h>
-#include "port/dirent.h"
+#include "port/port_dirent.h"
 #include "port/sys_time.h"
 
 #include <cstdlib>

diff --git a/tools/ldb_cmd.cc b/tools/ldb_cmd.cc
@@ -16,7 +16,7 @@
 #include "db/dbformat.h"
 #include "db/log_reader.h"
 #include "db/write_batch_internal.h"
-#include "port/dirent.h"
+#include "port/port_dirent.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/table_properties.h"
 #include "rocksdb/utilities/backupable_db.h"