273/376: Fix more warnings

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit 3a9b4a146777ae219ec890c2f806d33f26bd5829
Author: Eelco Dolstra <address@hidden>
Date:   Tue Oct 14 15:14:54 2014 +0200

    Fix more warnings
---
 src/libexpr/eval.cc |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 5b9db6e..8bc992d 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -212,9 +212,9 @@ EvalState::EvalState(const Strings & _searchPath)
            allocated.  This might be a problem on systems that don't
            overcommit. */
         if (!getenv("GC_INITIAL_HEAP_SIZE")) {
-            size_t maxSize = 384 * 1024 * 1024;
             size_t size = 32 * 1024 * 1024;
 #if HAVE_SYSCONF && defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES)
+            size_t maxSize = 384 * 1024 * 1024;
             long pageSize = sysconf(_SC_PAGESIZE);
             long pages = sysconf(_SC_PHYS_PAGES);
             if (pageSize != -1)
@@ -312,11 +312,6 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, 
const Symbol & sym, co
     throw EvalError(format(s) % sym % p1 % p2);
 }
 
-LocalNoInlineNoReturn(void throwTypeError(const char * s))
-{
-    throw TypeError(s);
-}
-
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const Pos & pos))
 {
     throw TypeError(format(s) % pos);
@@ -327,11 +322,6 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, 
const string & s1))
     throw TypeError(format(s) % s1);
 }
 
-LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1, 
const string & s2))
-{
-    throw TypeError(format(s) % s1 % s2);
-}
-
 LocalNoInlineNoReturn(void throwTypeError(const char * s, const ExprLambda & 
fun, const Symbol & s2, const Pos & pos))
 {
     throw TypeError(format(s) % fun.showNamePos() % s2 % pos);