Fixed some typos that were preventing compilation.

diff --git a/src/aop-main.c b/src/aop-main.c
index e80f106188f134ebe6d20925220d4d3f3cc957cc..1ed8274b3ed7a25c88f97e49babe7a751e36c629 100644 (file)
--- a/src/aop-main.c
+++ b/src/aop-main.c
@@ -48,7 +48,9 @@
 #include <gimple.h>
 #include <c-common.h>
 
-#include "aop-main.c"
+#include "aop.h"
+
+static const char *aop_plugin_name;
 
 static struct opt_pass template_pass = {
   .type = GIMPLE_PASS,
@@ -64,7 +66,7 @@ static struct opt_pass template_pass = {
   .properties_destroyed = 0,
   .todo_flags_start = 0,
   .todo_flags_finish = TODO_update_ssa,
-}
+};
 
 void aop_register_pass (const char *pass_name, pass_callback callback)
 {
@@ -86,7 +88,7 @@ void aop_register_pass (const char *pass_name, pass_callback callback)
 
 /* This is the last plug-in function called before GCC exits.  Clean
    up all the memory we allocated. */
-static void cleanup (void *event_date, void *data)
+static void aop_cleanup (void *event_date, void *data)
 {
 }
 
@@ -98,8 +100,10 @@ int plugin_init (struct plugin_name_args *plugin_info,
 {
   fprintf (stderr, "InterAspect init.\n");
 
+  plugin_info->base_name;
+
   /* Register our cleanup function. */
-  register_callback (plugin_name, PLUGIN_FINISH, aop_cleanup, NULL);
+  register_callback (aop_plugin_name, PLUGIN_FINISH, aop_cleanup, NULL);
 
   /* Give the client plug-in its chance to register a pass. */
   aop_main ();

diff --git a/src/aop.h b/src/aop.h
index 0ce560d51a064ac4b045f1d9f842a186fbab2cfe..4e74025c900046aef65b065f07f828e4f53e8ed5 100644 (file)
--- a/src/aop.h
+++ b/src/aop.h
@@ -29,7 +29,7 @@
    calls can pass values from the running program to the advice
    function. */
 
-typedef (unsigned int)(*pass_callback)();
+typedef unsigned int (*pass_callback)();
 
 void aop_register_pass(const char *pass_name, pass_callback callback);
 void aop_main();