Removed no-longer-needed declarations of __SOME_SKIN_H.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2025

diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index 4161fe7f2c2c90cf4a1c1b6b5b86b2bd82d905c5..f983239abc616e6849bd2668cfc533fb0d4a01a3 100644 (file)
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -52,11 +52,7 @@
    myexit().  Also fprintf doesn't seem safe.
 */
 
-/* Sidestep the normal check which disallows using valgrind.h
-   directly. */
-#define __VALGRIND_SOMESKIN_H
 #include "valgrind.h"    /* For the request-passing mechanism */
-
 #include "vg_include.h"  /* For the VG_USERREQ__* constants */
 
 #define __USE_UNIX98

diff --git a/coregrind/vg_intercept.c b/coregrind/vg_intercept.c
index d73c20e745d822cd77d4dc6942d5757bbd651cc1..31211392f1c689989fa86da7ea31df293e29e905 100644 (file)
--- a/coregrind/vg_intercept.c
+++ b/coregrind/vg_intercept.c
@@ -46,11 +46,7 @@
    a way as to make the previous interception scheme stop working.
 */
 
-/* Sidestep the normal check which disallows using valgrind.h
-   directly. */
-#define __VALGRIND_SOMESKIN_H
 #include "valgrind.h"
-
 #include "vg_include.h"
 #include "vg_kerneliface.h"
 

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 4161fe7f2c2c90cf4a1c1b6b5b86b2bd82d905c5..f983239abc616e6849bd2668cfc533fb0d4a01a3 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -52,11 +52,7 @@
    myexit().  Also fprintf doesn't seem safe.
 */
 
-/* Sidestep the normal check which disallows using valgrind.h
-   directly. */
-#define __VALGRIND_SOMESKIN_H
 #include "valgrind.h"    /* For the request-passing mechanism */
-
 #include "vg_include.h"  /* For the VG_USERREQ__* constants */
 
 #define __USE_UNIX98

diff --git a/coregrind/vg_replace_malloc.c b/coregrind/vg_replace_malloc.c
index a1162eb2425dd7ab395ead2c332ea178955cbe24..8eda9c89c33c3b42737236a367ee455f22979c32 100644 (file)
--- a/coregrind/vg_replace_malloc.c
+++ b/coregrind/vg_replace_malloc.c
@@ -41,11 +41,8 @@
    that will be called.
    ------------------------------------------------------------------ */
 
-#include "vg_include.h"
-
-/* Sidestep the normal check which disallows using valgrind.h directly. */
-#define __VALGRIND_SOMESKIN_H
 #include "valgrind.h"            /* for VALGRIND_NON_SIMD_CALL[12] */
+#include "vg_include.h"
 
 /*------------------------------------------------------------*/
 /*--- Command line options                                 ---*/

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index e3c763bc7eccb561c840f41f7d729a1484f690a9..67824e6571f5603e052919f47dee5cd6af6f3c2b 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -28,13 +28,9 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
-
-/* Sidestep the normal check which disallows using valgrind.h
-   directly. */
-#define __VALGRIND_SOMESKIN_H
 #include "valgrind.h" /* for VG_USERREQ__RUNNING_ON_VALGRIND and
                              VG_USERREQ__DISCARD_TRANSLATIONS, and others */
+#include "vg_include.h"
 
 /* BORKAGE/ISSUES as of 29 May 02
 

diff --git a/memcheck/mac_replace_strmem.c b/memcheck/mac_replace_strmem.c
index 1a9255eb433140da4acb6aecb25f4f0bee5bea93..06e6a57abd034923bbc6fdf1a72d41fbcb245ed5 100644 (file)
--- a/memcheck/mac_replace_strmem.c
+++ b/memcheck/mac_replace_strmem.c
@@ -31,8 +31,6 @@
 */
 
 #include "mc_include.h"
-
-#define __VALGRIND_SOMESKIN_H
 #include "valgrind.h"
 
 /* ---------------------------------------------------------------------

diff --git a/none/tests/discard.c b/none/tests/discard.c
index c44cac0183b972d2bf506e43845158efa77a3a50..3a1fc653dc209c24dbfb47976280a5a43c041da6 100644 (file)
--- a/none/tests/discard.c
+++ b/none/tests/discard.c
@@ -1,10 +1,10 @@
 
 #include <stdio.h>
-/* Sidestep the normal check which disallows using valgrind.h
-   directly. */
-#define __VALGRIND_SOMESKIN_H
 #include "../../include/valgrind.h"
 
+
+
+
 int fooble ( void )
 {
   int x, y;