Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
agocontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
27
Issues
27
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
agocontrol
agocontrol
Commits
c2fd6b96
Commit
c2fd6b96
authored
Mar 19, 2019
by
Johan Ström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MacOS build fix
parent
49d369c4
Pipeline
#414
passed with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
CMakeLists.txt
CMakeLists.txt
+3
-1
agoresolver.cpp
core/resolver/agoresolver.cpp
+2
-2
agorpc.cpp
core/rpc/agorpc.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
c2fd6b96
...
...
@@ -50,7 +50,9 @@ else()
set
(
CONFDIR
${
ETCDIR
}
/opt/agocontrol CACHE STRING
"Directory for agocontrol settings"
)
set
(
DATADIR /var/opt/agocontrol CACHE STRING
"Directory for variable data"
)
set
(
LOCALSTATEDIR /var/opt/agocontrol CACHE STRING
"Directory for state info"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"-Wl,-z,now"
)
if
(
NOT CMAKE_SYSTEM_NAME MATCHES
"Darwin"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"-Wl,-z,now"
)
endif
()
endif
()
# Common structure
...
...
core/resolver/agoresolver.cpp
View file @
c2fd6b96
...
...
@@ -20,7 +20,7 @@
#include <termios.h>
#include <errno.h>
#include <stdlib.h>
#if
ndef __FreeBSD__
#if
!defined(__FreeBSD__) && !defined(__APPLE__)
#include <sys/sysinfo.h>
#endif
...
...
@@ -191,7 +191,7 @@ Json::Value AgoResolver::getDefaultParameters()
}
void
AgoResolver
::
get_sysinfo
()
{
#if
ndef __FreeBSD__
#if
!defined(__FreeBSD__) && !defined(__APPLE__)
/* Note on FreeBSD exclusion. Sysinfo.h does not exist, but the code below
* does not really use it anyway.. so just skip it.
*/
...
...
core/rpc/agorpc.cpp
View file @
c2fd6b96
...
...
@@ -571,7 +571,7 @@ boost::shared_ptr<HttpReqRep> AgoRpc::uploadFiles(struct mg_connection *conn, st
AGO_ERROR
()
<<
"Uploaded file
\"
"
<<
tempfile
.
string
()
<<
"
\"
not fully written (no space left?)"
;
FILE_UPLOAD_ERROR
(
"Failed to write file, no space left?"
);
}
else
{
request
[
"filesize"
]
=
data_len
;
request
[
"filesize"
]
=
(
Json
::
UInt64
)
data_len
;
response
[
"size"
]
=
(
Json
::
UInt64
)
data_len
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment