Changeset 584 for GPL/branches/DAZ/lib32

Timestamp:

Jul 15, 2014, 12:38:08 AM (11 years ago)

Author:

David Azarewicz

Message:

cleanup continued

Location:

GPL/branches/DAZ/lib32

Files:

• Makefile (modified) (2 diffs)
• pci_iomap_compat.c (added)
• stack.c (moved) (moved from GPL/branches/DAZ/lib32/stack.cpp ) (3 diffs)

GPL/branches/DAZ/lib32/Makefile

@@ -6 +6 @@
 !include $(ROOT)\tools\header.mif
 
-CINCLUDES = $(ROOT)\include;$(WATCOM)\H;$(WATCOM)\H\OS2;
 AINCLUDES = $(DDK)\base\H
-
-CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_
 
 !if "$(IBM_BUILD)" == "1"
@@ -25 +22 @@
   strncpy.obj task.obj &
   strncmp.obj timer.obj &
-  instropl2.obj instropl3.obj vsprintf.obj
+  instropl2.obj instropl3.obj vsprintf.obj &
+  pci_iomap_compat.obj
 # ossidc.obj semaphore.obj waitqueue.obj misc.obj fminstrload.obj
 !if $(KEE) == 0

GPL/branches/DAZ/lib32/stack.c

@@ -20 +20 @@
  */
 
-extern "C" {
 #define INCL_NOPMAPI
 #define INCL_DOSERRORS           // for ERROR_INVALID_FUNCTION
 #include <os2.h>
-}
 #include <devhelp.h>
 #include <ossidc.h>
@@ -144 +142 @@
                     return;
             }
-    } 
+    }
     DevPopf(cpuflags);
     DebugInt3();
@@ -158 +156 @@
 
     offset = addr32 - (ULONG)StackBase;
-    
+
     if(offset > TOTAL_STACKSIZE) {
         //bad boy!