Changeset 372 for branches/samba-3.3.x/source/lib

Timestamp:

Jan 15, 2010, 1:16:04 PM (16 years ago)

Author:

Silvan Scherrer

Message:

remove hardcoded path, remove some files

Location:

branches/samba-3.3.x/source/lib

Files:

• os2ea.c (modified) (5 diffs)
• os2path.c (added)

branches/samba-3.3.x/source/lib/os2ea.c

@@ -29 +29 @@
 
 #ifndef TESTING
+
+// Samba DEBUG() needs the following includes and defines
 #define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
 #define CMD_KI_RDCNT            (0x63)
-
+#include <stdbool.h>
 #include "local.h"
 #include "xfile.h"
-#define DEBUG(a,b) (0)
-
+#include "debug.h"
 #else
 
@@ -167 +168 @@
 } CPUUTIL;
 
+APIRET APIENTRY(*pfnDosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, ULONG ulParm2, ULONG ulParm3) = NULL;
+APIRET APIENTRY(*pfnDosQuerySysState) (ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz) = NULL;
 
 static UCHAR randbyte_perf()
@@ -174 +177 @@
     int c;
 
-#ifndef __INNOTEK_LIBC__
     if (hDoscalls == 0) {
         char failed_module[20];
@@ -183 +185 @@
 
         if (rc == 0) {
-            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&DosPerfSysCall);
+            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&pfnDosPerfSysCall);
 
             if (rc) {
-                DosPerfSysCall = NULL;
+                pfnDosPerfSysCall = NULL;
             }
         }
     }
 
-    if (DosPerfSysCall) {
-        if (DosPerfSysCall(CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
+    if (pfnDosPerfSysCall) {
+        if ((*pfnDosPerfSysCall) (CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
             for (c = 0; c < sizeof(util); c++) {
                 byte ^= ((UCHAR *)&util)[c];
@@ -198 +200 @@
         }
         else {
-            DosPerfSysCall = NULL;
+            pfnDosPerfSysCall = NULL;
         }
     }
-#endif
+
     return byte;
 }