Changeset d54a8f0 in OpenModelica

Timestamp:

2013-08-26T09:43:26+02:00 (11 years ago)

Author:

Lennart Ochel <lennart.ochel@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

27a8a7db

Parents:

6d92f1f6

Message:

64-bit windows api is not available in mingw

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@16914 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• Compiler/runtime/getMemorySize.c (modified) (2 diffs)

Compiler/runtime/getMemorySize.c

@@ -30 +30 @@
 static size_t getMemorySizeBytes( )
 {
-#if defined(_WIN32) && (defined(__CYGWIN__) || defined(__CYGWIN32__))
+#if (defined(_WIN32) && (defined(__CYGWIN__) || defined(__CYGWIN32__))) || defined(_WIN32)
   /* Cygwin under Windows. ------------------------------------ */
   /* New 64-bit MEMORYSTATUSEX isn't available.  Use old 32.bit */
@@ -37 +37 @@
   GlobalMemoryStatus( &status );
   return (size_t)status.dwTotalPhys;
-
-#elif defined(_WIN32)
-  /* Windows. ------------------------------------------------- */
-  /* Use new 64-bit MEMORYSTATUSEX, not old 32-bit MEMORYSTATUS */
-  MEMORYSTATUSEX status;
-  status.dwLength = sizeof(status);
-  GlobalMemoryStatusEx( &status );
-  return (size_t)status.ullTotalPhys;
 
 #elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))