Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / shared / mux.cpp

diff --git a/shared/mux.cpp b/shared/mux.cpp
index da618e0c6bbc1066ef4c3db110f935c48c0bde45..4970bcea81bcd684eb019d5484586d888c757a80 100644 (file)
--- a/shared/mux.cpp
+++ b/shared/mux.cpp
@@ -22,7 +22,7 @@ extern "C" {
 }
 
 #include "shared/metrics.h"
-#include "shared/mux_opts.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
 
 using namespace std;