Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
celllframe-node
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
celllframe-node
Merge requests
!15
Feature 2336a
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Feature 2336a
feature-2336a
into
master
Overview
0
Commits
6
Pipelines
0
Changes
17
Merged
alexander.lysikov
requested to merge
feature-2336a
into
master
5 years ago
Overview
0
Commits
6
Pipelines
0
Changes
2
Expand
👍
0
👎
0
Merge request reports
Viewing commit
66176be9
Prev
Next
Show latest version
2 files
+
2
−
18
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
66176be9
Merge branch 'master' into HEAD
· 66176be9
alexander.lysikov
authored
5 years ago
# Conflicts: # CMakeLists.txt
sources/main.c
+
1
−
17
Options
@@ -102,23 +102,7 @@
@@ -102,23 +102,7 @@
#include
"dap_process_manager.h"
#include
"dap_process_manager.h"
#include
"dap_traffic_track.h"
#include
"dap_traffic_track.h"
#define DAP_APP_NAME NODE_NETNAME "-node"
#include
"dap_defines.h"
#ifdef _WIN32
#define SYSTEM_PREFIX "opt/"DAP_APP_NAME
#else
#define SYSTEM_PREFIX "/opt/"DAP_APP_NAME
#endif
#define LOCAL_PREFIX "~/."DAP_APP_NAME
#define SYSTEM_CONFIGS_DIR SYSTEM_PREFIX"/etc"
#define LOCAL_CONFIGS_DIR LOCAL_PREFIX"/etc"
#define SYSTEM_CONFIG_GLOBAL_FILENAME SYSTEM_PREFIX"/etc/"DAP_APP_NAME".cfg"
#define LOCAL_CONFIG_GLOBAL LOCAL_PREFIX"/etc/"DAP_APP_NAME".cfg"
#define SYSTEM_PID_FILE_PATH SYSTEM_PREFIX"/run/"DAP_APP_NAME".pid"
#define LOCAL_PID_FILE_PATH SYSTEM_PREFIX"/run/"DAP_APP_NAME".pid"
#define ENC_HTTP_URL "/enc_init"
#define ENC_HTTP_URL "/enc_init"
#define STREAM_CTL_URL "/stream_ctl"
#define STREAM_CTL_URL "/stream_ctl"
Loading