General fixes + get it working on OSX

setup.py

@@ -1,15 +1,31 @@
 import os
-from distutils.core import setup, Extension
+#from distutils.core import setup, Extension
+from setuptools import setup, Extension
+import pkg_resources
+
+platform = pkg_resources.get_platform()
+
+if 'macosx' in platform:
+    pyndri_ext = Extension(
+        'pyndri_ext',
+        sources=['src/pyndri.cpp'],
+        extra_compile_args=['-std=c++11'],
+        libraries=['indri', 'z', 'pthread', 'm'],
+        library_dirs=list(
+            filter(len, os.environ.get('LD_LIBRARY_PATH', '').split(':'))),
+        undef_macros=['NDEBUG'])
+
+else:
+     pyndri_ext = Extension(
+        'pyndri_ext',
+        sources=['src/pyndri.cpp'],
+        libraries=['indri', 'z', 'pthread', 'm'],
+        library_dirs=list(
+            filter(len, os.environ.get('LD_LIBRARY_PATH', '').split(':'))),
+        define_macros=[('_GLIBCXX_USE_CXX11_ABI', '0'),
+                    ('P_NEEDS_GNU_CXX_NAMESPACE', '1')],
+        undef_macros=['NDEBUG'])   
 
-pyndri_ext = Extension(
-    'pyndri_ext',
-    sources=['src/pyndri.cpp'],
-    libraries=['indri', 'z', 'pthread', 'm'],
-    library_dirs=list(
-        filter(len, os.environ.get('LD_LIBRARY_PATH', '').split(':'))),
-    define_macros=[('_GLIBCXX_USE_CXX11_ABI', '0'),
-                   ('P_NEEDS_GNU_CXX_NAMESPACE', '1')],
-    undef_macros=['NDEBUG'])
 
 setup(name='pyndri',
       version='1.0',

src/pyndri.cpp

@@ -65,7 +65,7 @@ static void Index_dealloc(Index* self) {
 
     delete [] self->repository_path_;
 
-    Py_DECREF(self->query_env_obj_);
+    Py_XDECREF(self->query_env_obj_);
     self->query_env_obj_ = NULL;
 }