PERFORCE change 151841 for review

[Peter Wemm]

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

Change 151841 by peter at peter_cheese on 2008/10/24 04:01:31

	Tidy up a little

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#7 (text+ko) ====

@@ -286,6 +286,9 @@
 #define FAILURE       (status->what == SsComplete &&  status->sres.isError)
 #define SWHAT         (status->what)
 #define RES           (getRES(status))
+#ifdef VGO_freebsd
+#define RES2          (getRES2(status))
+#endif
 #define ERR           (getERR(status))
 
 static inline UWord getRES ( SyscallStatus* st ) {
@@ -293,6 +296,13 @@
    vg_assert(!st->sres.isError);
    return st->sres.res;
 }
+#ifdef VGO_freebsd
+static inline UWord getRES2 ( SyscallStatus* st ) {
+   vg_assert(st->what == SsComplete);
+   vg_assert(!st->sres.isError);
+   return st->sres.res2;
+}
+#endif
 
 static inline UWord getERR ( SyscallStatus* st ) {
    vg_assert(st->what == SsComplete);
@@ -300,15 +310,6 @@
    return st->sres.err;
 }
 
-#ifdef VGO_freebsd
-/* FreeBSD syscalls have TWO return values! */
-#define RES2          (getRES(status))
-static inline UWord getRES2 ( SyscallStatus* st ) {
-   vg_assert(st->what == SsComplete);
-   vg_assert(!st->sres.isError);
-   return st->sres.res2;
-}
-#endif