Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ unreleased
- Fix bugs on signature help about labelled and optional parameters (#2032)
- Add `-end-position` parameter for `enclosing` (#2029)
- Signature help should appear even if the 'in' is not written (#2036)
+ merlin binary
- Define PATH_MAX to 4096 if undefined (eg. hurd) (#2039)
+ tests
- Add a reproduction case for #1214, the issue has been resolved before (#2022)
- Add reproduction case for #1763 but it is not failing anymore (#2021)
Expand Down
5 changes: 5 additions & 0 deletions src/frontend/ocamlmerlin/ocamlmerlin.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ static void failwith(const char *msg)
exit(EXIT_FAILURE);
}

#ifndef PATH_MAX
/* PATH_MAX is undefined on e.g. Hurd */
#define PATH_MAX 8192
#endif

#ifdef _WIN32
#define PATHSZ (MAX_PATH+1)
#define SOCKSZ (MAX_PATH+1)
Expand Down