Changeset 924 for trunk/mmap.c

Timestamp:

06/24/2012 08:34:35 AM (11 months ago)

Author:

moo

Message:

fix invalidate CRT parameters

Files:

• trunk/mmap.c (modified) (5 diffs)

trunk/mmap.c

@@ -45 +45 @@
     long  diff;
     xc_shmsize_t size;
+    xc_shmsize_t memoffset;
     char *name;
-    int newfile;
-    xc_shmsize_t memoffset;
 #ifdef ZEND_WIN32
     HANDLE hmap;
     HANDLE hmap_ro;
+#else
+    int newfile;
 #endif
 };
@@ -120 +121 @@
 
     if (shm->name) {
-#ifdef __CYGWIN__
+#ifndef ZEND_WIN32
+#   ifdef __CYGWIN__
         if (shm->newfile) {
             unlink(shm->name);
         }
+#   endif
 #endif
         free(shm->name);
@@ -142 +145 @@
 #else
 #   define TMP_PATH "/tmp/XCache"
+    int fd = -1;
 #endif
     xc_shm_t *shm = NULL;
-    int fd = -1;
     int ro_ok;
     volatile void *romem;
@@ -260 +263 @@
     /* }}} */
 
+#ifndef ZEND_WIN32
     close(fd);
-#ifndef __CYGWIN__
+
+#   ifndef __CYGWIN__
     if (shm->newfile) {
         unlink(shm->name);
     }
+#   endif
 #endif
 
@@ -270 +276 @@
 
 err:
+#ifndef ZEND_WIN32
     if (fd != -1) {
         close(fd);
     }
+#endif
     if (shm) {
         xc_mmap_destroy(shm);