From 2990d3e626e8fe58dec37705596722bdd3f619f2 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 10 Jun 2005 22:39:04 +0000
Subject: [PATCH] Moved VG_(fd_{hard,soft}_limit) into a better spot.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3871
---
 coregrind/core.h              | 4 ----
 coregrind/m_libcfile.c        | 4 ++++
 coregrind/m_main.c            | 4 ----
 coregrind/pub_core_libcfile.h | 4 ++++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/coregrind/core.h b/coregrind/core.h
index 6b668209f..bd0b4cd43 100644
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -56,10 +56,6 @@
 /* The directory we look for all our auxillary files in */
 #define VALGRINDLIB	"VALGRINDLIB"
 
-/* Application-visible file descriptor limits */
-extern Int VG_(fd_soft_limit);
-extern Int VG_(fd_hard_limit);
-
 /* ---------------------------------------------------------------------
    Exports of vg_intercept.c
    ------------------------------------------------------------------ */
diff --git a/coregrind/m_libcfile.c b/coregrind/m_libcfile.c
index 31c36f5cb..ea3c0705b 100644
--- a/coregrind/m_libcfile.c
+++ b/coregrind/m_libcfile.c
@@ -39,6 +39,10 @@
    File stuff
    ------------------------------------------------------------------ */
 
+/* Application-visible file descriptor limits */
+Int VG_(fd_soft_limit) = -1;
+Int VG_(fd_hard_limit) = -1;
+
 static inline Bool fd_exists(Int fd)
 {
    struct vki_stat st;
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index eef614969..5d58a979c 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -125,10 +125,6 @@ const Char *VG_(libdir) = VG_LIBDIR;
 static Int  vg_argc;
 static Char **vg_argv;
 
-/* Application-visible file descriptor limits */
-Int VG_(fd_soft_limit) = -1;
-Int VG_(fd_hard_limit) = -1;
-
 /* As deduced from sp_at_startup, the client's argc, argv[] and
    envp[] as extracted from the client's stack at startup-time. */
 Int    VG_(client_argc);
diff --git a/coregrind/pub_core_libcfile.h b/coregrind/pub_core_libcfile.h
index 59386ade9..147bd0ded 100644
--- a/coregrind/pub_core_libcfile.h
+++ b/coregrind/pub_core_libcfile.h
@@ -38,6 +38,10 @@
 
 #include "pub_tool_libcfile.h"
 
+/* Application-visible file descriptor limits */
+extern Int VG_(fd_soft_limit);
+extern Int VG_(fd_hard_limit);
+
 /* Move an fd into the Valgrind-safe range */
 extern Int VG_(safe_fd)(Int oldfd);