Skip to content

Commit

Permalink
Fix small Makefile errors & Python wrapper return value
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenwdv committed Feb 16, 2022
1 parent 7798aac commit 32bd89a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WRAPPERS ?= $(notdir $(patsubst %/,%,$(wildcard wrappers/*/)))
test-wrappers: build
$(MAKE) $(foreach wrapper,$(WRAPPERS),.test-$(wrapper))

clean: .clean_libs $(foreach wrapper,$(WRAPPERS),.clean-$(wrapper))
clean: .clean-libs $(foreach wrapper,$(WRAPPERS),.clean-$(wrapper))

.clean-libs:
$(MAKE) -C exports clean
Expand Down
2 changes: 1 addition & 1 deletion wrappers/php/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test: install-header install-dev-dependencies

composers = composer composer.phar ./composer ./composer.phar
# Find first composer from list above, default to 'composer'
find_composer = $(firstword $(foreach bin,$(composers),$(if $(shell command -v $(bin)),$(bin),)) composer)
find_composer = $(firstword $(foreach bin,$(composers),$(if $(shell command -v $(bin) 2>/dev/null),$(bin),)) composer)
# Lazy variable: https://blog.jgc.org/2016/07/lazy-gnu-make-variables.html
COMPOSER ?= $(eval COMPOSER := $(find_composer))$(COMPOSER)

Expand Down
2 changes: 1 addition & 1 deletion wrappers/python/eduvpncommon/discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def make(bs: bytes) -> "_GoSlice":
return _GoSlice((c_char * len(bs))(*bs), len(bs), len(bs))


_lib.Verify.argtypes, _lib.Verify.restype = [_GoSlice, _GoSlice, _GoSlice, c_uint64], c_int64
_lib.Verify.argtypes, _lib.Verify.restype = [_GoSlice, _GoSlice, _GoSlice, c_uint64], c_int8
_lib.InsecureTestingSetExtraKey.argtypes, _lib.InsecureTestingSetExtraKey.restype = [_GoSlice], None


Expand Down

0 comments on commit 32bd89a

Please sign in to comment.