andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#5145 , rename port/dirent.h to port/port_dirent.h to avoid compile err when use port dir as header dir output (#5152)

Browse Source 
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: https://github.com/facebook/rocksdb/pull/5152

Differential Revision: D14779409

Pulled By: siying

fbshipit-source-id: d4162c47c979c6e8cc6a9e601802864ab3768ecb
This commit is contained in:
datonli 2019-04-04 11:31:04 -07:00 committed by Facebook Github Bot
parent 75e8b6dfcf
commit f0edf9d575
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WINDOWS_PORT.md
View File

@ -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`) * 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 * 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` * 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. * `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 * in class member initialization were moved to a __ctors in some cases

0
port/dirent.h → port/port_dirent.h
View File

2
port/win/env_win.cc
View File

@ -24,7 +24,7 @@
#include "rocksdb/slice.h" #include "rocksdb/slice.h"
#include "port/port.h" #include "port/port.h"
#include "port/dirent.h" #include "port/port_dirent.h"
#include "port/win/win_logger.h" #include "port/win/win_logger.h"
#include "port/win/io_win.h" #include "port/win/io_win.h"

2
port/win/port_win.cc
View File

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

2
tools/ldb_cmd.cc
View File

@ -16,7 +16,7 @@
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/log_reader.h" #include "db/log_reader.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "port/dirent.h" #include "port/port_dirent.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"
#include "rocksdb/table_properties.h" #include "rocksdb/table_properties.h"
#include "rocksdb/utilities/backupable_db.h" #include "rocksdb/utilities/backupable_db.h"