Changeset 588 for GPL/branches/uniaud32-2.1.x/lib32/memory.c

Timestamp:

Feb 10, 2017, 2:50:49 AM (8 years ago)

Author:

David Azarewicz

Message:

Build system cleanup

File:

• GPL/branches/uniaud32-2.1.x/lib32/memory.c (moved) (moved from GPL/branches/uniaud32-2.1.x/lib32/memory.cpp ) (10 diffs)

GPL/branches/uniaud32-2.1.x/lib32/memory.c

@@ -23 +23 @@
  */
 
-extern "C" {
 #define INCL_NOPMAPI
 #define INCL_DOSERRORS           // for ERROR_INVALID_FUNCTION
 #include <os2.h>
-}
 #include <devhelp.h>
 #include <ossidc.h>
@@ -43 +41 @@
 #define PAGE_SIZE 4096
 
-extern "C" {
-
 int free_pages(unsigned long addr, unsigned long order);
 int __compat_get_order(unsigned long size);
@@ -174 +170 @@
 }
 //******************************************************************************
-extern "C" int fStrategyInit;
+extern int fStrategyInit;
 //******************************************************************************
 APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr)
@@ -180 +176 @@
     APIRET rc;
     ULONG addr;
+    SHORT sel;
 
     if(fStrategyInit && !(flags & VMDHA_16M)) {
@@ -188 +185 @@
 
 #ifdef KEE
-    SHORT sel;
 
     rc = KernVMAlloc(size, flags, (PVOID*)&addr, (PVOID*)-1, &sel);
@@ -566 +562 @@
         return 0;
 }
-//******************************************************************************
+
 //******************************************************************************
 #ifdef DEBUGHEAP
@@ -598 +594 @@
     return addr;
 }
-//******************************************************************************
+
 //******************************************************************************
 #ifdef DEBUGHEAP
@@ -609 +605 @@
 
     addr  = (ULONG)ptr;
-    if(addr == NULL) {
+    if(addr == 0)
+    {
         DebugInt3();
         return;
@@ -623 +620 @@
     else  vfree((PVOID)addr);
 }
-//******************************************************************************
+
 //******************************************************************************
 void *kzalloc(size_t size, unsigned int flags)
@@ -641 +638 @@
         return kzalloc(n * size, flags);
 }
-//******************************************************************************
-//******************************************************************************
-
-}
+