summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqiuyiuestc <[email protected]>2010-09-20 00:02:11 +0000
committerqiuyiuestc <[email protected]>2010-09-20 00:02:11 +0000
commita8eff5c9657df3441eb5ea6bfbf56f69fc7c6b93 (patch)
tree4dc8e538ee024b28f9753a26b8c30accf2af7c35
parent446799244a2b796dbcd83bf8e557aff4ebaadc7d (diff)
fix object create error
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@916 bbd45198-f89e-11dd-88c7-29a3b14d5316
-rw-r--r--src/module.c2
-rw-r--r--src/object.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/module.c b/src/module.c
index 44a0081d54..2fb704534a 100644
--- a/src/module.c
+++ b/src/module.c
@@ -35,7 +35,7 @@
#define IS_AX(s) ((s.sh_flags & SHF_ALLOC) && (s.sh_flags & SHF_EXECINSTR))
#define IS_AW(s) ((s.sh_flags & SHF_ALLOC) && (s.sh_flags & SHF_WRITE))
-static struct rt_module* rt_current_module;
+static struct rt_module* rt_current_module = RT_NULL;
/**
* This function will return self module object
diff --git a/src/object.c b/src/object.c
index e8adc60cc2..2b8ccb62d3 100644
--- a/src/object.c
+++ b/src/object.c
@@ -258,10 +258,10 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char* name)
#ifdef RT_USING_MODULE
/* get module object information */
information = (rt_module_self() != RT_NULL) ?
- &rt_module_self()->module_object[type] : &rt_module_self()[type];
+ &rt_module_self()->module_object[type] : &rt_object_container[type];
#else
/* get object information */
- information = &rt_module_self()[type];
+ information = &rt_object_container[type];
#endif
object = (struct rt_object*)rt_malloc(information->object_size);