summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2009-11-13 10:53:14 +0000
committerOlle Johansson <oej@edvina.net>2009-11-13 10:53:14 +0000
commitebc3aff1c35a35815820ad59f324466d9a87e1cf (patch)
tree32055ef76bbef2343426210a3262e4b841305d13 /main
parent5fcf1c92681b796ce67dea5dfa14cf0fcd3a8af9 (diff)
Fixing trunk in a way so that it compiles again.
Thanks, Philippe :-) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@229871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/loader.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/main/loader.c b/main/loader.c
index 198ebc929..8c0067d92 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -853,8 +853,7 @@ static struct load_order_entry *add_to_load_order(const char *resource, struct l
if (!resource_name_match(order->resource, resource)) {
/* Make sure we have the proper setting for the required field
(we might have both load= and required= lines in modules.conf) */
- order->required |= required;
- }
+ order->required |= required;
return NULL;
}
}