From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Thu, 13 Nov 2003 23:02:16 +0000 (+0000)
Subject: Removed no-longer-needed declarations of __SOME_SKIN_H.
X-Git-Tag: svn/VALGRIND_2_1_0~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4d186f121d9fc72c393cb27c3bb47ddcde53f6c;p=thirdparty%2Fvalgrind.git

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 4161fe7f2c..f983239abc 100644
--- 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 d73c20e745..31211392f1 100644
--- 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 4161fe7f2c..f983239abc 100644
--- 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 a1162eb242..8eda9c89c3 100644
--- 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 e3c763bc7e..67824e6571 100644
--- 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 1a9255eb43..06e6a57abd 100644
--- 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 c44cac0183..3a1fc653dc 100644
--- 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;