From 844a0ca8c7573bcff81bb1fa09f0c5f86fb06946 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Thu, 23 Jul 2009 17:16:14 +0100
Subject: [PATCH] --- yaml --- r: 156243 b: refs/heads/master c:
 fc4c73554c9d93b3e495f2f7acae1323b0d5db84 h: refs/heads/master i:   156241:
 b910ca2f31bff590cf6c1832bd95910bd4013f4c   156239:
 e60debfde95e775cd5e5a0ed2a3350d19533934f v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/recordmcount.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3e73c264e160..98d5d188461e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8650ae32ef7045e763825dee6256dde7f331bb85
+refs/heads/master: fc4c73554c9d93b3e495f2f7acae1323b0d5db84
diff --git a/trunk/scripts/recordmcount.pl b/trunk/scripts/recordmcount.pl
index 7109e2b5bc0a..16c5563b4129 100755
--- a/trunk/scripts/recordmcount.pl
+++ b/trunk/scripts/recordmcount.pl
@@ -414,7 +414,7 @@ sub update_funcs
 	    $read_function = 0;
 	} else {
 	    # if we already have a function, and this is weak, skip it
-	    if (!defined($ref_func) || !defined($weak{$text})) {
+	    if (!defined($ref_func) && !defined($weak{$text})) {
 		$ref_func = $text;
 	    }
 	}