Rename libtopology -> topology. C API part for #3.

y-higuchi · Feb 22, 2013 · 317f5bb · 317f5bb
1 parent 1281d8d
commit 317f5bb
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/src/examples/topology/show_switch_status.c b/src/examples/topology/show_switch_status.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "trema.h"
-#include "libtopology.h"
-#include "topology_service_interface_option_parser.h"
 
 
 void

diff --git a/src/examples/topology/show_topology.c b/src/examples/topology/show_topology.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "trema.h"
-#include "libtopology.h"
-#include "topology_service_interface_option_parser.h"
 
 
 struct dpid_entry {

diff --git a/src/lib/libtopology.c → src/lib/topology.c b/src/lib/libtopology.c → src/lib/topology.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include "trema.h"
-#include "libtopology.h"
+#include "topology.h"
 
 static char *libtopology_queue_name = NULL;
 static char *topology_name = NULL;

diff --git a/src/lib/libtopology.h → src/lib/topology.h b/src/lib/libtopology.h → src/lib/topology.h
diff --git a/src/lib/trema.h b/src/lib/trema.h
@@ -45,6 +45,8 @@
 #include "persistent_storage.h"
 #include "stat.h"
 #include "timer.h"
+#include "topology.h"
+#include "topology_service_interface_option_parser.h"
 #include "utility.h"
 #include "wrapper.h"
 

diff --git a/unittests/lib/libtopology_test.c b/unittests/lib/libtopology_test.c
@@ -14,7 +14,7 @@
 #include "checks.h"
 #include "cmockery_trema.h"
 
-#include "libtopology.h"
+#include "topology.h"
 
 #include "event_handler.h"
 #include "messenger.h"