gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS X build break

Browse Source 
Former-commit-id: 5e6b4ab99e6f2ad29577c8d4cc151284f0c652b4
This commit is contained in:
John Sully 2020-04-15 22:43:40 -04:00
parent 2a14dcc7d1
commit e09a2ac94a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -20,10 +20,10 @@ jobs:
runs-on: ubuntu-16.04 runs-on: ubuntu-16.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: | - name: make
run:
sudo apt-get install uuid-dev libcurl4-openssl-dev sudo apt-get install uuid-dev libcurl4-openssl-dev
make make
run: make
build-macos-latest: build-macos-latest:
runs-on: macos-latest runs-on: macos-latest

6
src/zmalloc.cpp
View File

@ -449,9 +449,6 @@ size_t zmalloc_get_smap_bytes_by_field(const char *field, long pid) {
return bytes; return bytes;
} }
#else #else
<<<<<<< HEAD:src/zmalloc.cpp
size_t zmalloc_get_smap_bytes_by_field(const char *field, long pid) {
=======
/* Get sum of the specified field from libproc api call. /* Get sum of the specified field from libproc api call.
* As there are per page value basis we need to convert * As there are per page value basis we need to convert
* them accordingly. * them accordingly.
@ -459,7 +456,7 @@ size_t zmalloc_get_smap_bytes_by_field(const char *field, long pid) {
* Note that AnonHugePages is a no-op as THP feature * Note that AnonHugePages is a no-op as THP feature
* is not supported in this platform * is not supported in this platform
*/ */
size_t zmalloc_get_smap_bytes_by_field(char *field, long pid) { size_t zmalloc_get_smap_bytes_by_field(const char *field, long pid) {
#if defined(__APPLE__) #if defined(__APPLE__)
struct proc_regioninfo pri; struct proc_regioninfo pri;
if (proc_pidinfo(pid, PROC_PIDREGIONINFO, 0, &pri, PROC_PIDREGIONINFO_SIZE) == if (proc_pidinfo(pid, PROC_PIDREGIONINFO, 0, &pri, PROC_PIDREGIONINFO_SIZE) ==
@ -474,7 +471,6 @@ size_t zmalloc_get_smap_bytes_by_field(char *field, long pid) {
} }
return 0; return 0;
#endif #endif
>>>>>>> redis/6.0:src/zmalloc.c
((void) field); ((void) field);
((void) pid); ((void) pid);
return 0; return 0;