projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5fcf1c9
)
Fixing trunk in a way so that it compiles again.
author
Olle Johansson
<oej@edvina.net>
Fri, 13 Nov 2009 10:53:14 +0000
(10:53 +0000)
committer
Olle Johansson
<oej@edvina.net>
Fri, 13 Nov 2009 10:53:14 +0000
(10:53 +0000)
Thanks, Philippe :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@229871
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
main/loader.c
patch
|
blob
|
history
diff --git
a/main/loader.c
b/main/loader.c
index
198ebc9
..
8c0067d
100644
(file)
--- 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;
}
}