Commit 86cbf312 authored by Jan Möbius's avatar Jan Möbius
Browse files

Memory checks not working on macos .. removed

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@9936 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 296be8bc
...@@ -59,7 +59,9 @@ ...@@ -59,7 +59,9 @@
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
#ifndef WIN32 #ifndef WIN32
#include <malloc.h> #ifndef ARCH_DARWIN
#include <malloc.h>
#endif
#endif #endif
//== IMPLEMENTATION ========================================================== //== IMPLEMENTATION ==========================================================
...@@ -114,9 +116,17 @@ void CoreWidget::showAboutWidget( ) { ...@@ -114,9 +116,17 @@ void CoreWidget::showAboutWidget( ) {
aboutWidget_->OpenFlipperAbout->setCurrentFont(boldFont); aboutWidget_->OpenFlipperAbout->setCurrentFont(boldFont);
aboutWidget_->OpenFlipperAbout->append(tr("Memory Information:")); aboutWidget_->OpenFlipperAbout->append(tr("Memory Information:"));
aboutWidget_->OpenFlipperAbout->setCurrentFont(standardFont); aboutWidget_->OpenFlipperAbout->setCurrentFont(standardFont);
#ifndef WIN32
#ifdef WIN32
aboutWidget_->OpenFlipperAbout->append(tr("Not available for this platform (WIN32)"));
#elif defined ARCH_DARWIN
aboutWidget_->OpenFlipperAbout->append(tr("Not available for this platform (MacOS)"));
#else
unsigned long memory = 0; unsigned long memory = 0;
struct mallinfo info; struct mallinfo info;
...@@ -153,9 +163,6 @@ void CoreWidget::showAboutWidget( ) { ...@@ -153,9 +163,6 @@ void CoreWidget::showAboutWidget( ) {
+ tr("(") + QString::number(availablePages,'f' ,0 ) + tr(" pages of ") + tr("(") + QString::number(availablePages,'f' ,0 ) + tr(" pages of ")
+ QString::number(pageSize,'f' ,2 ) + tr("KB size)")); + QString::number(pageSize,'f' ,2 ) + tr("KB size)"));
#else
aboutWidget_->OpenFlipperAbout->append(tr("Not available for this platform"));
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment