Merge remote-tracking branch 'tor-github/pr/1329'

This commit is contained in:
Nick Mathewson 2019-10-16 12:31:47 -04:00
commit 2c97cf3add
2 changed files with 4 additions and 3 deletions

3
changes/ticket31336 Normal file
View file

@ -0,0 +1,3 @@
o Minor bugfixes (developer tools):
- Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug
31336; bugfix on 0.4.1.2-alpha.

View file

@ -15,9 +15,7 @@ import time
def topdir_file(name):
"""Strip opening "src" from a filename"""
if name.startswith("src/"):
name = name[4:]
return name
return os.path.relpath(name, './src')
def guard_macro(name):
"""Return the guard macro that should be used for the header file 'name'.