[Gnash-commit] gnash ./ChangeLog server/shm.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/03/06 18:03:31

Modified files:
        .              : ChangeLog 
        server         : shm.cpp 

Log message:
        * server/shm.cpp: Clear up ifdef mess... Both shm_open() and
        shmget() use file descriptors.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.174&tr2=1.175&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shm.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.174 gnash/ChangeLog:1.175
--- gnash/ChangeLog:1.174       Mon Mar  6 01:43:25 2006
+++ gnash/ChangeLog     Mon Mar  6 18:03:30 2006
@@ -1,3 +1,8 @@
+2006-03-06  Rob Savoye  <address@hidden>
+
+       * server/shm.cpp: Clear up ifdef mess... Both shm_open() and
+       shmget() use file descriptors.
+
 2006-03-05  Rob Savoye  <address@hidden>
 
        * server/Date.cpp: If we don't have gettimeofday, use
Index: gnash/server/shm.cpp
diff -u gnash/server/shm.cpp:1.6 gnash/server/shm.cpp:1.7
--- gnash/server/shm.cpp:1.6    Mon Mar  6 01:43:25 2006
+++ gnash/server/shm.cpp        Mon Mar  6 18:03:30 2006
@@ -152,7 +152,7 @@
     
     // MacOSX returns this when you use O_EXCL for shm_open() instead
     // of EEXIST
-#ifdef HAVE_SHMGET
+#if defined(HAVE_SHMGET) ||  defined(HAVE_SHM_OPEN)
     if (_shmfd < 0 && errno == EINVAL)
 #else
     if (_shmhandle <= 0 && errno == EINVAL)
@@ -175,7 +175,7 @@
     }
     
     // We got the file descriptor, now map it into our process.
-#ifdef HAVE_SHMGET
+#if defined(HAVE_SHMGET) ||  defined(HAVE_SHM_OPEN)
     if (_shmfd >= 0)
 #else
     if (_shmhandle >= 0)
@@ -186,14 +186,10 @@
            // Set the size so we can write to new segment
            ftruncate(_shmfd, _size);
        }
-# ifdef HAVE_MMAP
        _addr = static_cast<char *>(mmap(0, _size,
                                 PROT_READ|PROT_WRITE|PROT_EXEC,
                                 MAP_SHARED|MAP_INHERIT|MAP_HASSEMAPHORE,
                                 _shmfd, 0));
-# else
-# error "Using POSIX memory but no mmap()!"
-# endif
        if (_addr == MAP_FAILED) {
            log_msg("WARNING: mmap() failed: %s\n", strerror(errno));
            return false;