CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/02/14 15:09:53
Modified files:
utilities : dumpshm.cpp
. : ChangeLog
Log message:
* utilities/dumpshm.cpp: Use struct shmid_ds instead of the
depreciated shminfo, so this works on *BSD.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5648&r2=1.5649
Patches:
Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- utilities/dumpshm.cpp 13 Feb 2008 02:36:34 -0000 1.24
+++ utilities/dumpshm.cpp 14 Feb 2008 15:09:52 -0000 1.25
@@ -269,7 +269,6 @@
{
int maxid, shmid, id;
struct shmid_ds shmseg;
- struct shminfo shminfo;
// #ifdef USE_POSIX_SHM
// if (library_dir != NULL) {
@@ -289,14 +288,17 @@
// By examing the size of each one, we can make a reasonable guess if it's
one
// used for flash. As permissions apply, this will only list the segments
created
// by the user running dumpshm.
- struct shm_info shm_info;
- maxid = shmctl(0, SHM_INFO, (struct shmid_ds *) (void *) &shm_info);
+// struct shm_info shm_info;
+// maxid = shmctl(0, SHM_INFO, (struct shmid_ds *) (void *) &shm_info);
+ struct shmid_ds shm_info;
+ maxid = shmctl(0, SHM_INFO, &shm_info);
if (maxid < 0) {
cerr << "kernel not configured for shared memory";
return 0;
}
- if ((shmctl(0, IPC_INFO, (struct shmid_ds *) (void *) &shminfo)) < 0) {
+// struct shminfo shminfo;
+ if ((shmctl(0, IPC_INFO, &shm_info)) < 0) {
return 0;
}
for (id = 0; id <= maxid; id++) {
@@ -312,7 +314,7 @@
cout << "Last changed on: " << ctime(&shmseg.shm_ctime);
cout << "Last attached on: " << ctime(&shmseg.shm_atime);
cout << "Last detached on: " << ctime(&shmseg.shm_dtime);
- return shmseg.shm_perm.__key;
+ return shmseg.shm_perm.IPC_PERM_KEY;
}
#endif // end of IPC_PERM_KEY
}
@@ -321,7 +323,7 @@
//#endif // end of USE_POSIX_SHM
// Didn't find any segments of the right size
- return reinterpret_cast<key_t>(0);
+ return static_cast<key_t>(0);
}
#endif // end of USE_SYSV_SHM & HAVE_IPC_INFO
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5648
retrieving revision 1.5649
diff -u -b -r1.5648 -r1.5649
--- ChangeLog 14 Feb 2008 13:27:55 -0000 1.5648
+++ ChangeLog 14 Feb 2008 15:09:52 -0000 1.5649
@@ -1,3 +1,8 @@
+2008-02-14 Rob Savoye <[EMAIL PROTECTED]>
+
+ * utilities/dumpshm.cpp: Use struct shmid_ds instead of the
+ depreciated shminfo, so this works on *BSD.
+
2008-02-14 Benjamin Wolsey <[EMAIL PROTECTED]>
* gui/gtk{sup.h,.cpp}: set up key event callbacks on the toplevel
@@ -279,6 +284,18 @@
2008-02-09 Rob Savoye <[EMAIL PROTECTED]>
+ * configure.ac: Add a --enable-allstatic option to produced a
+ dynamically linked Gnash, but with dependant librairies statically
+ linked in. This reduces dependancy problems for binary tarballs,
+ plus the plugins still build as shared libs still.
+ * utilities/Makefile.am: Wrap our dependant libraries with
+ --static and -shared to force static linking if --enable-allstatic
+ is specified.
+ * gui/Makefile.am: Wrap our dependant libraries with --static and
+ -shared to force static linking if --enable-allstatic is
+ specified.
+
+ * packaging/install-gnash.sh: Install everything correctly.
* packaging/snapshot.am: Fix rules to build binary tarballs
correctly. Add snapshot-rpm target that builds an rpm which is
properly cvs date stamped.
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
