Fix some vg_include.h references.

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

diff --git a/coregrind/core.h b/coregrind/core.h
index 27b95e46498d15d49238ce18d42df0b006464d4b..69a57a09c2754d673e83f6561ac5ad8b15411948 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -2,7 +2,7 @@
 /*--------------------------------------------------------------------*/
 /*--- A header file for all private parts of Valgrind's core.      ---*/
 /*--- Include no other!                                            ---*/
-/*---                                                 vg_include.h ---*/
+/*---                                                       core.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -30,8 +30,8 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#ifndef __VG_INCLUDE_H
-#define __VG_INCLUDE_H
+#ifndef __CORE_H
+#define __CORE_H
 
 /* ---------------------------------------------------------------------
    Build options and table sizes.  You should be able to change these
@@ -45,7 +45,7 @@
 
 /* All stuff visible to core and tools goes in vg_skin.h.  Things
  * visible to core but not visible to any tools should go in this
- * file, vg_include.h. */
+ * file, core.h. */
 #include "vg_skin.h"
 #include "valgrind.h"
 
@@ -1623,7 +1623,7 @@ extern Int VGOFF_(tls_ptr);
 
 extern Int VGOFF_(helper_undefined_instruction);
 
-#endif /* ndef __VG_INCLUDE_H */
+#endif /* ndef __CORE_H */
 
 
 /* ---------------------------------------------------------------------
@@ -1633,5 +1633,5 @@ extern Int VGOFF_(helper_undefined_instruction);
 #include "config.h"
 
 /*--------------------------------------------------------------------*/
-/*--- end                                             vg_include.h ---*/
+/*--- end                                                   core.h ---*/
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/vg_intercept.c.base b/coregrind/vg_intercept.c.base
index 71fb7deb1a6668a34cb13e4d733a24f335648bc0..b76d3b9a0836d898ba91fe6b649647db59050f47 100644 (file)
--- a/coregrind/vg_intercept.c.base
+++ b/coregrind/vg_intercept.c.base
@@ -65,7 +65,7 @@
  */
 
 #include "valgrind.h"
-#include "vg_include.h"
+#include "core.h"
 #include <unistd.h>
 #include <signal.h>
 

diff --git a/coregrind/vg_replace_malloc.c.base b/coregrind/vg_replace_malloc.c.base
index 562a24cc36fb1689fd41e9f61ff4ae4552c69a7e..faae2ab883555834c2da28b3f6db996e32f25487 100644 (file)
--- a/coregrind/vg_replace_malloc.c.base
+++ b/coregrind/vg_replace_malloc.c.base
@@ -42,7 +42,7 @@
    ------------------------------------------------------------------ */
 
 #include "valgrind.h"            /* for VALGRIND_NON_SIMD_CALL[12] */
-#include "vg_include.h"
+#include "core.h"
 #include "vg_skin.h"
 
 #define LIBALIAS(ret, name, args) \

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 68948971463f5914e2dfa0433946ce75fb6c73eb..c27ce364737aaccaef639d60891233e20622d3b0 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -37,7 +37,7 @@
    Types and globals for the scheduler.
    ------------------------------------------------------------------ */
 
-/* ThreadId and ThreadState are defined in vg_include.h. */
+/* ThreadId and ThreadState are defined in core.h. */
 
 /* Globals.  A statically allocated array of threads.  NOTE: [0] is
    never used, to simplify the simulation of initialisers for
@@ -2024,7 +2024,7 @@ void do__apply_in_new_thread ( ThreadId parent_tid,
    MUTEXes
    -------------------------------------------------------- */
 
-/* vg_pthread_mutex_t is defined in vg_include.h.
+/* vg_pthread_mutex_t is defined in core.h.
 
    The initializers zero everything, except possibly the fourth word,
    which in vg_pthread_mutex_t is the __vg_m_kind field.  It gets set to one
@@ -2299,7 +2299,7 @@ void do_pthread_mutex_unlock ( ThreadId tid,
    CONDITION VARIABLES
    -------------------------------------------------------- */
 
-/* The relevant type (vg_pthread_cond_t) is in vg_include.h.
+/* The relevant type (vg_pthread_cond_t) is in core.h.
 
    We don't use any fields of vg_pthread_cond_t for anything at all.
    Only the identity of the CVs is important.  (Actually, we initialise
@@ -3449,7 +3449,7 @@ void scheduler_sanity ( void )
                "Terminating Valgrind.  If thread(s) "
                "really need more stack, increase");
             VG_(message)(Vg_UserMsg,
-               "VG_PTHREAD_STACK_SIZE in vg_include.h and recompile.");
+               "VG_PTHREAD_STACK_SIZE in core.h and recompile.");
             VG_(exit)(1);
         }
       }