PERFORCE change 152319 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=152319

Change 152319 by peter at peter_overcee on 2008/11/01 18:27:22

	Note that sigaction.sa_flags is an int on both of our platforms.

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#4 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#3 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#4 (text+ko) ====

@@ -66,7 +66,7 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* Note that this uses 32 bit words, even on amd64 */
+/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#3 (text+ko) ====

@@ -66,6 +66,7 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
+/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
@@ -122,7 +123,7 @@
 
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
-	unsigned long sa_flags;
+	unsigned int sa_flags;
 	vki_sigset_t sa_mask;		/* mask last for extensibility */
 };