Changeset 3600 for trunk

Timestamp:

Oct 4, 2007, 9:11:44 PM (18 years ago)

Author:

bird

Message:

build on linux.

File:

• trunk/kStuff/kRdr/kRdrFile.cpp (modified) (10 diffs)

trunk/kStuff/kRdr/kRdrFile.cpp

@@ -34 +34 @@
 #include <k/kErrors.h>
 
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
+# include <k/kHlpSys.h>
 # include <sys/fcntl.h>
 # include <sys/mman.h>
 # include <unistd.h>
-extern int kHlpSys_open(const char *filename, int flags, int mode); /* negated errno */
-extern int kHlpSys_close(int fd);
-extern KSSIZE kHlpSys_read(int fd, void *buf, size_t len); /* negated errno */
-extern KI64 kHlpSys_lseek(int fd, int whench, KI64); /* negated errno */
-extern void *kHlpSys_mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off);
-extern int kHlpSys_mprotect(void *addr, size_t len, int prot);
-extern int kHlpSys_munmap(void *addr, size_t len);
-
 
 #elif K_OS == K_OS_OS2
@@ -576 +574 @@
     pPrep->cb = (pPrep->cb + (cbPage - 1)) & ~(cbPage- 1);
 
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
     /** @todo */
 
@@ -829 +832 @@
     return 0x1000; /** @todo find some header somewhere... */
 
+#elif K_OS == K_OS_LINUX
+    return 0x1000; /** @todo find some header somewhere... */
+
 #elif K_OS == K_OS_OS2
     /* The page size on OS/2 wont change anytime soon. :-) */
@@ -856 +862 @@
     PKRDRFILE pRdrFile = (PKRDRFILE)pRdr;
 #if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
  || K_OS == K_OS_OS2 \
+ || K_OS == K_OS_SOLARIS \
  || K_OS == K_OS_WINDOWS
     return (KIPTR)pRdrFile->File;
@@ -875 +886 @@
     if (pRdrFile->off == -1)
     {
-#if K_OS == K_OS_DARWIN
-
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
         pRdrFile->off = kHlpSys_lseek(pRdrFile->File, SEEK_CUR, 0);
         if (pRdrFile->off < 0)
@@ -981 +996 @@
     if (pRdrFile->off != off)
     {
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
         pRdrFile->off = kHlpSys_lseek(pRdrFile->File, SEEK_SET, off);
         if (pRdrFile->off < 0)
@@ -1025 +1045 @@
      * Do the read.
      */
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
     {
     KSSIZE cbRead;
@@ -1088 +1113 @@
     int          rc;
 
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
     rc = kHlpSys_close(pRdrFile->File);
 
@@ -1123 +1153 @@
      * Open the file, determin its size and correct filename.
      */
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
     int         File;
     KFOFF       cb;
@@ -1235 +1270 @@
     if (!pRdrFile)
     {
-#if K_OS == K_OS_DARWIN
+#if K_OS == K_OS_DARWIN \
+ || K_OS == K_OS_FREEBSD \
+ || K_OS == K_OS_LINUX \
+ || K_OS == K_OS_NETBSD \
+ || K_OS == K_OS_OPENBSD \
+ || K_OS == K_OS_SOLARIS
         kHlpSys_close(File);
 #elif K_OS == K_OS_OS2