Consistently use the same #if style. Also, fix a bug testing for sbrk(3)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19071 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/Unix/Process.cpp b/lib/System/Unix/Process.cpp
index 654390432d4af0b09e203fe3a69a1e3e438c2157..c9507cb4e7be8eee1cb3005e2eaa11b74905c865 100644 (file)
--- a/lib/System/Unix/Process.cpp
+++ b/lib/System/Unix/Process.cpp
@@ -50,11 +50,11 @@ static char* som = reinterpret_cast<char*>(::sbrk(0));
 uint64_t 
 Process::GetMallocUsage()
 {
-#ifdef HAVE_MALLINFO
+#if defined(HAVE_MALLINFO)
   struct mallinfo mi;
   mi = ::mallinfo();
   return mi.uordblks;
-#elif HAVE_SBRK
+#elif defined(HAVE_SBRK)
   // Note this is only an approximation and more closely resembles
   // the value returned by mallinfo in the arena field.
   char * eom = sbrk(0);
@@ -71,7 +71,7 @@ Process::GetMallocUsage()
 uint64_t
 Process::GetTotalMemoryUsage()
 {
-#ifdef HAVE_MALLINFO
+#if defined(HAVE_MALLINFO)
   struct mallinfo mi = ::mallinfo();
   return mi.uordblks + mi.hblkhd;
 #else
@@ -85,7 +85,7 @@ Process::GetTimeUsage(TimeValue& elapsed, TimeValue& user_time,
                       TimeValue& sys_time)
 {
   elapsed = TimeValue::now();
-#ifdef HAVE_GETRUSAGE
+#if defined(HAVE_GETRUSAGE)
   struct rusage usage;
   ::getrusage(RUSAGE_SELF, &usage);
   user_time.seconds( usage.ru_utime.tv_sec );

diff --git a/lib/System/Unix/Process.inc b/lib/System/Unix/Process.inc
index 654390432d4af0b09e203fe3a69a1e3e438c2157..c9507cb4e7be8eee1cb3005e2eaa11b74905c865 100644 (file)
--- a/lib/System/Unix/Process.inc
+++ b/lib/System/Unix/Process.inc
@@ -50,11 +50,11 @@ static char* som = reinterpret_cast<char*>(::sbrk(0));
 uint64_t 
 Process::GetMallocUsage()
 {
-#ifdef HAVE_MALLINFO
+#if defined(HAVE_MALLINFO)
   struct mallinfo mi;
   mi = ::mallinfo();
   return mi.uordblks;
-#elif HAVE_SBRK
+#elif defined(HAVE_SBRK)
   // Note this is only an approximation and more closely resembles
   // the value returned by mallinfo in the arena field.
   char * eom = sbrk(0);
@@ -71,7 +71,7 @@ Process::GetMallocUsage()
 uint64_t
 Process::GetTotalMemoryUsage()
 {
-#ifdef HAVE_MALLINFO
+#if defined(HAVE_MALLINFO)
   struct mallinfo mi = ::mallinfo();
   return mi.uordblks + mi.hblkhd;
 #else
@@ -85,7 +85,7 @@ Process::GetTimeUsage(TimeValue& elapsed, TimeValue& user_time,
                       TimeValue& sys_time)
 {
   elapsed = TimeValue::now();
-#ifdef HAVE_GETRUSAGE
+#if defined(HAVE_GETRUSAGE)
   struct rusage usage;
   ::getrusage(RUSAGE_SELF, &usage);
   user_time.seconds( usage.ru_utime.tv_sec );