Skip to content

Commit

Permalink
Merge branch 'master' into upload
Browse files Browse the repository at this point in the history
* master: (113 commits)
  fixed Tencent#305 xcode9 build fail
  fixed windows compile
  update README.md
  rename mars/lint/Clang-Format Style Options - Clang 3.7 documentation.mhtml
  update android sample version
  update android sample version
  make shortlink release async
  fix missing previous so when build mulit-archs
  longlink connect at once when redotask
  delete windows x64 config
  "ANR_CHECK_DISABLE" move from .cc to header
  add messagequeue log info
  windows compile
  add windows in README.md
  fixed mac compile
  Windows compile
  uncomment temporarily optimization weak network when networkchange
  build_for_win32.py
  if onnetworkchange is already on mq, no need to change to mq again
  sample use marsopen.cn
  ...

# Conflicts:
#	.gitignore
#	mars/libraries/build_android.py
#	mars/libraries/mars_android_sdk/jni/longlink_packer.cc.rewriteme
#	mars/stn/jni/sources.mk
#	mars/stn/stn.xcodeproj/project.pbxproj
#	mars/stn/stn_logic.cc
  • Loading branch information
tomlee0201 committed Oct 6, 2017
2 parents fd806f3 + f685e74 commit 74c2881
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mars/comm/network/getgateway.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Many systems should provide route information through raw PF_ROUTE
* sockets. */

#define __ROUTE_HEADER_FILE__ <net/route.h>
#define __ROUTE_HEADER_FILE__ "comm/objc/route.h"

#ifdef __linux__
#define USE_PROC_NET_ROUTE
Expand Down

0 comments on commit 74c2881

Please sign in to comment.