Przeglądaj źródła

Fixed compile error without XML library

Tatsuhiro Tsujikawa 13 lat temu
rodzic
commit
2148cbaf1d
2 zmienionych plików z 12 dodań i 9 usunięć
  1. 9 6
      src/HttpServer.cc
  2. 3 3
      src/Makefile.am

+ 9 - 6
src/HttpServer.cc

@@ -330,19 +330,22 @@ int HttpServer::setupResponseRecv()
       return 0;
     }
   } else if(getMethod() == "POST") {
+    if(path == "/jsonrpc") {
+      if(reqType_ != RPC_TYPE_JSON) {
+        reqType_ = RPC_TYPE_JSON;
+        lastBody_.reset(new json::JsonDiskWriter());
+      }
+      return 0;
+    }
+#ifdef ENABLE_XML_RPC
     if(path == "/rpc") {
       if(reqType_ != RPC_TYPE_XML) {
         reqType_ = RPC_TYPE_XML;
         lastBody_.reset(new rpc::XmlRpcDiskWriter());
       }
       return 0;
-    } else if(path == "/jsonrpc") {
-      if(reqType_ != RPC_TYPE_JSON) {
-        reqType_ = RPC_TYPE_JSON;
-        lastBody_.reset(new json::JsonDiskWriter());
-      }
-      return 0;
     }
+#endif // ENABLE_XML_RPC
   }
   reqType_ = RPC_TYPE_NONE;
   lastBody_.reset();

+ 3 - 3
src/Makefile.am

@@ -239,7 +239,8 @@ SRCS =  Socket.h\
 	UnknownOptionException.cc UnknownOptionException.h\
 	Notifier.cc Notifier.h\
 	ValueBaseDiskWriter.h\
-	AnonDiskWriterFactory.h
+	AnonDiskWriterFactory.h\
+	XmlRpcRequestParserController.cc XmlRpcRequestParserController.h
 
 if MINGW_BUILD
 SRCS += WinConsoleFile.cc WinConsoleFile.h
@@ -271,8 +272,7 @@ SRCS +=  ExpatXmlParser.cc ExpatXmlParser.h
 endif # HAVE_LIBEXPAT
 
 if ENABLE_XML_RPC
-SRCS += XmlRpcRequestParserController.cc XmlRpcRequestParserController.h\
-	XmlRpcRequestParserStateMachine.cc XmlRpcRequestParserStateMachine.h\
+SRCS += XmlRpcRequestParserStateMachine.cc XmlRpcRequestParserStateMachine.h\
 	XmlRpcRequestParserState.h\
 	XmlRpcRequestParserStateImpl.cc XmlRpcRequestParserStateImpl.h\
 	XmlRpcDiskWriter.cc XmlRpcDiskWriter.h