diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-16 22:26:44 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-16 22:26:44 +0000 |
| commit | d95d9bb24ea20a2859f16b74d93d4379466983df (patch) | |
| tree | d6274f7857479c52c80618a84add2fdf72d7168c | |
| parent | 784b683ab46ce427ce7db49fa7c9446f1748413d (diff) | |
Temporarily revert revision 89325, which added md5 magic for keeping track of
what build options were used. We agreed that we should remove this before
making a 1.4 release, and then we can put it back in. Then, we can take a
month or so to play around with it to get it how we want it.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@89339 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | build_tools/make_buildopts_h | 3 | ||||
| -rw-r--r-- | include/asterisk/module.h | 5 | ||||
| -rw-r--r-- | main/loader.c | 11 |
3 files changed, 1 insertions, 18 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 7d85836eb..ac41a006a 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -14,7 +14,4 @@ done if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes then echo "#define AST_DEVMODE 1" - TMP="${TMP} AST_DEVMODE" fi -BUILDSUM=`echo ${TMP} | md5sum` -echo "#define AST_BUILDOPT_SUM {0x${BUILDSUM:0:8}, 0x${BUILDSUM:8:8}, 0x${BUILDSUM:16:8}, 0x${BUILDSUM:24:8}}" diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 2c39cc2d7..7f14df7f9 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -203,7 +203,6 @@ struct ast_module_info { const char *key; unsigned int flags; - unsigned int buildopt_sum[4]; /* The value of AST_BUILDOPT_SUM when this module was compiled */ }; void ast_module_register(const struct ast_module_info *); @@ -230,8 +229,7 @@ void ast_module_unref(struct ast_module *); AST_MODULE, \ desc, \ keystr, \ - flags_to_set, \ - AST_BUILDOPT_SUM, \ + flags_to_set \ }; \ static void __attribute__ ((constructor)) __reg_module(void) \ { \ @@ -261,7 +259,6 @@ const static __attribute__((unused)) struct ast_module_info *ast_module_info; .flags = flags_to_set, \ .description = desc, \ .key = keystr, \ - .buildopt_sum = AST_BUILDOPT_SUM, \ fields \ }; \ static void __attribute__ ((constructor)) __reg_module(void) \ diff --git a/main/loader.c b/main/loader.c index f0b98f9b9..7df486251 100644 --- a/main/loader.c +++ b/main/loader.c @@ -76,8 +76,6 @@ static unsigned char expected_key[] = { 0x87, 0x76, 0x79, 0x35, 0x23, 0xea, 0x3a, 0xd3, 0x25, 0x2a, 0xbb, 0x35, 0x87, 0xe4, 0x22, 0x24 }; -static unsigned int buildopt_sum[4] = AST_BUILDOPT_SUM; - static unsigned int embedding = 1; /* we always start out by registering embedded modules, since they are here before we dlopen() any */ @@ -600,8 +598,6 @@ int ast_module_reload(const char *name) static unsigned int inspect_module(const struct ast_module *mod) { - unsigned int buildopt_empty[4] = { 0, }; - if (!mod->info->description) { ast_log(LOG_WARNING, "Module '%s' does not provide a description.\n", mod->resource); return 1; @@ -617,13 +613,6 @@ static unsigned int inspect_module(const struct ast_module *mod) return 1; } - if (memcmp(buildopt_empty, mod->info->buildopt_sum, sizeof(buildopt_empty)) && - memcmp(buildopt_sum, mod->info->buildopt_sum, sizeof(buildopt_sum))) { - ast_log(LOG_WARNING, "Module '%s' was not compiled with the same compile-time options as this version of Asterisk.\n", mod->resource); - ast_log(LOG_WARNING, "Module '%s' will not be initialized as it may cause instability.\n", mod->resource); - return 1; - } - return 0; } |