fix StorageEngine::singleton and std::function<void()> type unmatched.

paddle/math/Storage.cpp

@@ -25,8 +25,8 @@ namespace paddle {
 // Initialization StorageEngine singleton.
 // Other modules may rely on storage management,
 // so StorageEngine need to be initialized before other modules.
-// static InitFunction __init_storage_engine(
-//            StorageEngine::singleton, std::numeric_limits<int>::max());
+static InitFunction __init_storage_engine([](){StorageEngine::singleton();},
+                                          std::numeric_limits<int>::max());
 
 StorageEngine::StorageEngine() : cpuAllocator_(nullptr) {
 }

paddle/pserver/LightNetwork.cpp

@@ -17,6 +17,7 @@ limitations under the License. */
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <fcntl.h>
 
 #include <arpa/inet.h>
@@ -25,12 +26,6 @@ limitations under the License. */
 #include <net/if_arp.h>
 #include <sstream>
 
-#if defined(__OSX__) || defined(__APPLE__)
-#include <netinet/tcp.h>
-#else
-#include <linux/tcp.h>
-#endif
-
 #include "LightNetwork.h"
 #include "paddle/utils/Util.h"
 #include "paddle/utils/StringUtil.h"