diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2003-01-12 15:08:05 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2003-01-12 15:08:05 +0000 |
commit | 47a34e156718facf7161a16cdb41cbb56e8a03f3 (patch) | |
tree | 9459d5e199c4fb7f41a7c136c6e1555b969ecc5a /editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h | |
parent | Add wallpaper management tool for the ROX desktop. (diff) |
Remove the procfs dependency. Use the PS_STRINGS macro to get argv[].
Notes
Notes:
svn path=/head/; revision=72972
Diffstat (limited to '')
-rw-r--r-- | editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h index d75cac79f29e..c4e255952fc7 100644 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h +++ b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h @@ -1,6 +1,20 @@ ---- ../sal/osl/unx/system.h.orig Mon Mar 11 01:41:13 2002 -+++ ../sal/osl/unx/system.h Mon Mar 11 01:41:25 2002 -@@ -216,12 +216,9 @@ +--- ../sal/osl/unx/system.h.orig Wed Jun 5 16:24:19 2002 ++++ ../sal/osl/unx/system.h Sun Jan 12 15:48:03 2003 +@@ -205,6 +205,13 @@ + # include <sys/ioctl.h> + # include <sys/time.h> + # include <sys/uio.h> ++# include <sys/exec.h> ++# include <vm/vm.h> ++# include <vm/vm_param.h> ++# include <vm/pmap.h> ++# include <vm/swap_pager.h> ++# include <machine/vmparam.h> ++# include <machine/pmap.h> + # include <sys/un.h> + # include <netinet/tcp.h> + # define IORESOURCE_TRANSFER_BSD +@@ -216,12 +223,13 @@ # elif BYTE_ORDER == PDP_ENDIAN # define _PDP_ENDIAN # endif @@ -10,8 +24,12 @@ -# define NO_PTHREAD_PRIORITY -# define CMD_ARG_PRG __progname -# define CMD_ARG_ENV environ -+# define CMD_ARG_PROC_STREAM -+# define CMD_ARG_PROC_NAME "/proc/%u/cmdline" ++/* __progname isn't sufficient here. We need the full path as well ++ * for e.g. setup and __progname only points to the binary name. ++ */ ++# define CMD_ARG_PRG_IS_DEFINED ++# define CMD_ARG_PRG *((struct ps_strings *)PS_STRINGS)->ps_argvstr ++# define CMD_ARG_ENV environ #endif #ifdef SCO |