Replaced #if by #ifdef, for clang.
Merge branch 'master' of github.com:andresy/torch into andresy