Changeset 10718

Timestamp:

Sep 12, 2008, 6:07:13 AM (11 years ago)

Author:

gb

Message:

Define and use LSEEK macro to force 64-bit lseek on Windows.

Location:

trunk/source/lisp-kernel

Files:

• image.c (modified) (9 diffs)
• macros.h (modified) (1 diff)
• memory.c (modified) (2 diffs)

trunk/source/lisp-kernel/image.c

@@ -93 +93 @@
 seek_to_next_page(int fd)
 {
-  off_t pos = lseek(fd, 0, SEEK_CUR);
+  off_t pos = LSEEK(fd, 0, SEEK_CUR);
   pos = align_to_power_of_2(pos, log2_page_size);
-  return lseek(fd, pos, SEEK_SET);
+  return LSEEK(fd, pos, SEEK_SET);
 }
   
@@ -111 +111 @@
   unsigned version, flags;
 
-  pos = lseek(fd, 0, SEEK_END);
+  pos = LSEEK(fd, 0, SEEK_END);
   if (pos < 0) {
     return false;
@@ -117 +117 @@
   pos -= sizeof(trailer);
 
-  if (lseek(fd, pos, SEEK_SET) < 0) {
+  if (LSEEK(fd, pos, SEEK_SET) < 0) {
     return false;
   }
@@ -133 +133 @@
     return false;
   }
-  if (lseek(fd, disp, SEEK_CUR) < 0) {
+  if (LSEEK(fd, disp, SEEK_CUR) < 0) {
     return false;
   }
@@ -227 +227 @@
     
   }
-  lseek(fd, pos+advance, SEEK_SET);
+  LSEEK(fd, pos+advance, SEEK_SET);
 }
 
@@ -249 +249 @@
     }
 #if WORD_SIZE == 64
-    lseek(fd, section_data_delta, SEEK_CUR);
+    LSEEK(fd, section_data_delta, SEEK_CUR);
 #endif
     for (i = 0; i < nsections; i++, sect++) {
@@ -380 +380 @@
   *header_pos = seek_to_next_page(fd);
 
-  if (lseek (fd, *header_pos, SEEK_SET) < 0) {
+  if (LSEEK (fd, *header_pos, SEEK_SET) < 0) {
     return errno;
   }
@@ -497 +497 @@
 #if WORD_SIZE == 64
   seek_to_next_page(fd);
-  section_data_delta = -((lseek(fd,0,SEEK_CUR)+sizeof(fh)+sizeof(sections)) -
+  section_data_delta = -((LSEEK(fd,0,SEEK_CUR)+sizeof(fh)+sizeof(sections)) -
                          image_data_pos);
   fh.section_data_offset_high = (int)(section_data_delta>>32L);
@@ -510 +510 @@
   trailer.sig1 = IMAGE_SIG1;
   trailer.sig2 = IMAGE_SIG2;
-  eof_pos = lseek(fd, 0, SEEK_CUR) + sizeof(trailer);
+  eof_pos = LSEEK(fd, 0, SEEK_CUR) + sizeof(trailer);
   trailer.delta = (int) (header_pos-eof_pos);
   if (write(fd, &trailer, sizeof(trailer)) == sizeof(trailer)) {

trunk/source/lisp-kernel/macros.h

@@ -91 +91 @@
   (((signed_natural *)((tcr)->tlb_pointer))[INTERRUPT_LEVEL_BINDING_INDEX])
 #endif
+
+#ifdef WINDOWS
+#define LSEEK(fd,offset,how) _lseeki64(fd,offset,how)
+#else
+#define LSEEK(fd,offset,how) lseek(fd,offset,how)
+#endif

trunk/source/lisp-kernel/memory.c

@@ -391 +391 @@
   size_t opos;
 
-  opos = lseek(fd, 0, SEEK_CUR);
+  opos = LSEEK(fd, 0, SEEK_CUR);
   CommitMemory(addr, nbytes);
-  lseek(fd, pos, SEEK_SET);
+  LSEEK(fd, pos, SEEK_SET);
 
   while (total < nbytes) {
@@ -403 +403 @@
   }
 
-  lseek(fd, opos, SEEK_SET);
+  LSEEK(fd, opos, SEEK_SET);
 
   return true;