move these forward declarations back to asterisk.h where they belong... even...

move these forward declarations back to asterisk.h where they belong... even though asterisk.h includes compat.h, these declarations have nothing to do with the being platform-compatible and are directly related to being part of Asterisk


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89482 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk.h

@@ -162,4 +162,14 @@ int64_t ast_mark(int, int start1_stop0);
 #define ast_mark(a, b) do { } while (0)
 #endif /* LOW_MEMORY */
 
+/*! \brief
+ * Definition of various structures that many asterisk files need,
+ * but only because they need to know that the type exists.
+ *
+ */
+
+struct ast_channel;
+struct ast_frame;
+struct ast_module;
+
 #endif /* _ASTERISK_H */

include/asterisk/compat.h

@@ -180,14 +180,4 @@ typedef unsigned int	u_int32_t;
 typedef unsigned long long uint64_t;
 #endif
 
-/*! \brief
- * Definition of various structures that many asterisk files need,
- * but only because they need to know that the type exists.
- *
- * We can move them to a different global header if necessary.
- */
-struct ast_channel;
-struct ast_frame;
-struct ast_module;
-
 #endif

utils/ael_main.c

@@ -4,7 +4,7 @@
 #include <regex.h>
 #include <limits.h>
 
-#include "asterisk/compat.h"
+#include "asterisk.h"
 #include "asterisk/channel.h"
 #include "asterisk/ast_expr.h"
 #include "asterisk/module.h"
@@ -75,10 +75,7 @@ char last_exten[18000];
 char ast_config_AST_CONFIG_DIR[PATH_MAX];
 char ast_config_AST_VAR_DIR[PATH_MAX];
 
-void ast_add_profile(void);
 void ast_cli_register_multiple(void);
-void ast_register_file_version(void);
-void ast_unregister_file_version(void);
 int ast_add_extension2(struct ast_context *con,
 					   int replace, const char *extension, int priority, const char *label, const char *callerid,
 						const char *application, void *data, void (*datad)(void *),
@@ -155,11 +152,20 @@ struct ast_custom_function *ast_custom_function_find(const char *name)
 	return 0; /* in "standalone" mode, functions are just not avail */
 }
 
+void ast_register_file_version(const char *file, const char *version)
+{
+}
 
-void ast_add_profile(void)
+void ast_unregister_file_version(const char *file)
+{
+}
+
+int ast_add_profile(const char *x, uint64_t scale)
 {
 	if (!no_comp)
 		printf("Executed ast_add_profile();\n");
+
+	return 0;
 }
 
 int ast_loader_register(int (*updater)(void))
@@ -186,20 +192,6 @@ void ast_cli_register_multiple(void)
         	printf("Executed ast_cli_register_multiple();\n");
 }
 
-void ast_register_file_version(void)
-{
-	/* if(!no_comp)
-		printf("Executed ast_register_file_version();\n"); */
-	/* I'm erasing this, because I don't think anyone really ever needs to see it anyway */
-}
-
-void ast_unregister_file_version(void)
-{
-	/* if(!no_comp)
-		printf("Executed ast_unregister_file_version();\n"); */
-	/* I'm erasing this, because I don't think anyone really ever needs to see it anyway */
-
-}
 void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char *cp2,int count);
 void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char *cp2,int count)
 {

utils/conf2ael.c

@@ -42,7 +42,7 @@
 #include <regex.h>
 #include <limits.h>
 
-#include "asterisk/compat.h"
+#include "asterisk.h"
 #include "asterisk/pbx.h"
 #include "asterisk/ast_expr.h"
 #include "asterisk/channel.h"
@@ -80,26 +80,12 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 /* static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); */
 extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
 
-/* modulation */
-void ast_add_profile(void);
-void ast_register_file_version(void);
-void ast_unregister_file_version(void);
-
-void ast_add_profile(void)
-{
-}
-void ast_register_file_version(void)
+void ast_register_file_version(const char *file, const char *version)
 {
-	/* if(!no_comp)
-	   printf("Executed ast_register_file_version();\n"); */
-	/* I'm erasing this, because I don't think anyone really ever needs to see it anyway */
 }
 
-void ast_unregister_file_version(void)
+void ast_unregister_file_version(const char *file)
 {
-	/* if(!no_comp)
-		printf("Executed ast_unregister_file_version();\n"); */
-	/* I'm erasing this, because I don't think anyone really ever needs to see it anyway */
 }
 
 /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */