Commit 3954ea82 authored by Robert Bradshaw's avatar Robert Bradshaw

Fix withgil + pure cdef merge conflict.

parent f4f2b5ac
...@@ -638,7 +638,8 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations): ...@@ -638,7 +638,8 @@ class InterpretCompilerDirectives(CythonTransform, SkipDeclarations):
'is not allowed in %s scope' % (directive, scope))) 'is not allowed in %s scope' % (directive, scope)))
return False return False
else: else:
if directive not in Options.directive_defaults: if (directive not in Options.directive_defaults
and directive not in Options.directive_types):
error(pos, "Invalid directive: '%s'." % (directive,)) error(pos, "Invalid directive: '%s'." % (directive,))
return True return True
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment