NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #540 from dalgaaf/wip-da-fix-elif

Browse Source 
Fix '#elif with no expression'
main
Igor Canadi 10 years ago
parent 98c37fda5d 969aa806b7
commit 413e35273e
3 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      port/stack_trace.cc
  2. 2
      util/env_posix.cc
  3. 2
      util/xfunc.h

2
port/stack_trace.cc
Unescape View File

@ -71,7 +71,7 @@ void PrintStackTraceLine(const char* symbol, void* frame) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
#elif OS_MACOSX #elif defined(OS_MACOSX)
void PrintStackTraceLine(const char* symbol, void* frame) { void PrintStackTraceLine(const char* symbol, void* frame) {
static int pid = getpid(); static int pid = getpid();

2
util/env_posix.cc
Unescape View File

@ -1412,7 +1412,7 @@ class PosixEnv : public Env {
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
return static_cast<uint64_t>(ts.tv_sec) * 1000000000 + ts.tv_nsec; return static_cast<uint64_t>(ts.tv_sec) * 1000000000 + ts.tv_nsec;
#elif __MACH__ #elif defined(__MACH__)
clock_serv_t cclock; clock_serv_t cclock;
mach_timespec_t ts; mach_timespec_t ts;
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);

2
util/xfunc.h
Unescape View File

@ -20,7 +20,7 @@ namespace rocksdb {
#if (ROCKSDB_XFTEST_FORCE == 1) #if (ROCKSDB_XFTEST_FORCE == 1)
#define XFUNC #define XFUNC
#endif #endif
#elif NDEBUG #elif defined(NDEBUG)
#else #else
#define XFUNC #define XFUNC
#endif #endif

Write Preview
Loading…
Cancel
Save