<commit_before>diff -ruN tables-3.2.0/c-blosc/hdf5/blosc_filter.c tables-3.2.0-new/c-blosc/hdf5/blosc_filter.c
--- tables-3.2.0/c-blosc/hdf5/blosc_filter.c	2015-05-04 06:18:44.000000000 -0600
+++ tables-3.2.0-new/c-blosc/hdf5/blosc_filter.c	2015-12-21 05:09:29.000000000 -0700
@@ -18,8 +18,9 @@
 #include "hdf5.h"
 #include "blosc_filter.h"
 
-#if H5Epush_vers == 2
+#if H5Epush_vers == 2 && !defined(_MSC_VER)
 /* 1.8.x */
+#define H5Epush_ifc_18
 #define PUSH_ERR(func, minor, str...) H5Epush(H5E_DEFAULT, __FILE__, func, __LINE__, H5E_ERR_CLS, H5E_PLINE, minor, str)
 #else
 /* 1.6.x */
@@ -195,7 +196,8 @@
         complist = blosc_list_compressors();
 	code = blosc_compcode_to_compname(compcode, &compname);
 	if (code == -1) {
-#if H5Epush_vers == 2
+// #if H5Epush_vers == 2
+#ifdef H5Epush_ifc_18
             PUSH_ERR("blosc_filter", H5E_CALLBACK,
                      "this Blosc library does not have support for "
                      "the '%s' compressor, but only for: %s",
diff -ruN tables-3.2.0/setup.py tables-3.2.0-new/setup.py
--- tables-3.2.0/setup.py	2015-05-04 10:14:22.000000000 -0600
+++ tables-3.2.0-new/setup.py	2015-12-21 05:02:47.000000000 -0700
@@ -383,20 +383,35 @@
     }
 elif os.name == 'nt':
     _Package = WindowsPackage
-    _platdep = {  # package tag -> platform-dependent components
+    HDF5_LIBNAMES_LACK_DLL = os.environ.get('HDF5_LIBNAMES_LACK_DLL', '')
+    if HDF5_LIBNAMES_LACK_DLL:
+      _platdep = {  # package tag -> platform-dependent components
+        'HDF5': ['hdf5', 'hdf5'],
+        'LZO2': ['lzo2', 'lzo2'],
+        'LZO': ['liblzo', 'lzo1'],
+        'BZ2': ['bzip2', 'bzip2'],
+        'BLOSC': ['blosc', 'blosc'],
+      }
+    else:
+      _platdep = {  # package tag -> platform-dependent components
         'HDF5': ['hdf5dll', 'hdf5dll'],
         'LZO2': ['lzo2', 'lzo2'],
         'LZO': ['liblzo', 'lzo1'],
         'BZ2': ['bzip2', 'bzip2'],
         'BLOSC': ['blosc', 'blosc'],
-    }
+      }
 
     # Copy the next DLL's to binaries by default.
     # Update these paths for your own system!
-    dll_files = ['\\windows\\system\\zlib1.dll',
-                 '\\windows\\system\\szip.dll',
-                 ]
+# Bilder builds without compression
+    # dll_files = ['\\windows\\system\\zlib1.dll',
+                 # '\\windows\\system\\szip.dll',
+                 # ]
+    dll_files = []
     if '--debug' in sys.argv:
+      if HDF5_LIBNAMES_LACK_DLL:
+        _platdep['HDF5'] = ['hdf5d', 'hdf5d']
+      else:
         _platdep['HDF5'] = ['hdf5ddll', 'hdf5ddll']
 
 hdf5_package = _Package("HDF5", 'HDF5', 'H5public', *_platdep['HDF5'])
@@ -483,7 +498,10 @@
 # variable to rebuild pytables
 if not HDF5_DIR and os.name == 'nt':
     import ctypes.util
-    libdir = ctypes.util.find_library('hdf5dll.dll')
+    if HDF5_LIBNAMES_LACK_DLL:
+      libdir = ctypes.util.find_library('hdf5.dll')
+    else:
+      libdir = ctypes.util.find_library('hdf5dll.dll')
     # Like 'C:\\Program Files\\HDF Group\\HDF5\\1.8.8\\bin\\hdf5dll.dll'
     if libdir:
         # Strip off the filename
diff -ruN tables-3.2.0/tables/__init__.py tables-3.2.0-new/tables/__init__.py
--- tables-3.2.0/tables/__init__.py	2015-04-21 05:37:18.000000000 -0600
+++ tables-3.2.0-new/tables/__init__.py	2015-12-21 05:02:47.000000000 -0700
@@ -60,9 +60,10 @@
     # In order to improve diagnosis of a common Windows dependency
     # issue, we explicitly test that we can load the HDF5 dll before
     # loading tables.utilsextensions.
-    if not _load_library('hdf5dll.dll', ctypes.cdll.LoadLibrary):
+    if not _load_library('hdf5.dll', ctypes.cdll.LoadLibrary):
+      if not _load_library('hdf5dll.dll', ctypes.cdll.LoadLibrary):
         raise ImportError(
-            'Could not load "hdf5dll.dll", please ensure'
+            'Could not load "hdf5.dll" or "hdf5dll.dll", please ensure'
             ' that it can be found in the system path')
 
     # Some PyTables binary distributions place the dependency DLLs in the<commit_msg>Adapting patch to windows again<commit_after>diff -ruN tables-3.2.0/c-blosc/hdf5/blosc_filter.c tables-3.2.0-new/c-blosc/hdf5/blosc_filter.c
--- tables-3.2.0/c-blosc/hdf5/blosc_filter.c	2015-05-04 06:18:44.000000000 -0600
+++ tables-3.2.0-new/c-blosc/hdf5/blosc_filter.c	2015-12-21 05:48:58.190977600 -0700
@@ -20,7 +20,11 @@
 
 #if H5Epush_vers == 2
 /* 1.8.x */
+#if defined(_MSC_VER)
+#define PUSH_ERR(func, minor, str) H5Epush(H5E_DEFAULT, __FILE__, func, __LINE__, H5E_ERR_CLS, H5E_PLINE, minor, str)
+#else
 #define PUSH_ERR(func, minor, str...) H5Epush(H5E_DEFAULT, __FILE__, func, __LINE__, H5E_ERR_CLS, H5E_PLINE, minor, str)
+#endif
 #else
 /* 1.6.x */
 #define PUSH_ERR(func, minor, str) H5Epush(__FILE__, func, __LINE__, H5E_PLINE, minor, str)
@@ -195,7 +199,8 @@
         complist = blosc_list_compressors();
 	code = blosc_compcode_to_compname(compcode, &compname);
 	if (code == -1) {
-#if H5Epush_vers == 2
+// #if H5Epush_vers == 2
+#ifdef H5Epush_ifc_18
             PUSH_ERR("blosc_filter", H5E_CALLBACK,
                      "this Blosc library does not have support for "
                      "the '%s' compressor, but only for: %s",
diff -ruN tables-3.2.0/setup.py tables-3.2.0-new/setup.py
--- tables-3.2.0/setup.py	2015-05-04 10:14:22.000000000 -0600
+++ tables-3.2.0-new/setup.py	2015-12-21 05:46:21.097977600 -0700
@@ -383,20 +383,35 @@
     }
 elif os.name == 'nt':
     _Package = WindowsPackage
-    _platdep = {  # package tag -> platform-dependent components
+    HDF5_LIBNAMES_LACK_DLL = os.environ.get('HDF5_LIBNAMES_LACK_DLL', '')
+    if HDF5_LIBNAMES_LACK_DLL:
+      _platdep = {  # package tag -> platform-dependent components
+        'HDF5': ['hdf5', 'hdf5'],
+        'LZO2': ['lzo2', 'lzo2'],
+        'LZO': ['liblzo', 'lzo1'],
+        'BZ2': ['bzip2', 'bzip2'],
+        'BLOSC': ['blosc', 'blosc'],
+      }
+    else:
+      _platdep = {  # package tag -> platform-dependent components
         'HDF5': ['hdf5dll', 'hdf5dll'],
         'LZO2': ['lzo2', 'lzo2'],
         'LZO': ['liblzo', 'lzo1'],
         'BZ2': ['bzip2', 'bzip2'],
         'BLOSC': ['blosc', 'blosc'],
-    }
+      }
 
     # Copy the next DLL's to binaries by default.
     # Update these paths for your own system!
-    dll_files = ['\\windows\\system\\zlib1.dll',
-                 '\\windows\\system\\szip.dll',
-                 ]
+# Bilder builds without compression
+    # dll_files = ['\\windows\\system\\zlib1.dll',
+                 # '\\windows\\system\\szip.dll',
+                 # ]
+    dll_files = []
     if '--debug' in sys.argv:
+      if HDF5_LIBNAMES_LACK_DLL:
+        _platdep['HDF5'] = ['hdf5d', 'hdf5d']
+      else:
         _platdep['HDF5'] = ['hdf5ddll', 'hdf5ddll']
 
 hdf5_package = _Package("HDF5", 'HDF5', 'H5public', *_platdep['HDF5'])
@@ -483,7 +498,10 @@
 # variable to rebuild pytables
 if not HDF5_DIR and os.name == 'nt':
     import ctypes.util
-    libdir = ctypes.util.find_library('hdf5dll.dll')
+    if HDF5_LIBNAMES_LACK_DLL:
+      libdir = ctypes.util.find_library('hdf5.dll')
+    else:
+      libdir = ctypes.util.find_library('hdf5dll.dll')
     # Like 'C:\\Program Files\\HDF Group\\HDF5\\1.8.8\\bin\\hdf5dll.dll'
     if libdir:
         # Strip off the filename
diff -ruN tables-3.2.0/tables/__init__.py tables-3.2.0-new/tables/__init__.py
--- tables-3.2.0/tables/__init__.py	2015-04-21 05:37:18.000000000 -0600
+++ tables-3.2.0-new/tables/__init__.py	2015-12-21 05:46:21.113577600 -0700
@@ -60,9 +60,10 @@
     # In order to improve diagnosis of a common Windows dependency
     # issue, we explicitly test that we can load the HDF5 dll before
     # loading tables.utilsextensions.
-    if not _load_library('hdf5dll.dll', ctypes.cdll.LoadLibrary):
+    if not _load_library('hdf5.dll', ctypes.cdll.LoadLibrary):
+      if not _load_library('hdf5dll.dll', ctypes.cdll.LoadLibrary):
         raise ImportError(
-            'Could not load "hdf5dll.dll", please ensure'
+            'Could not load "hdf5.dll" or "hdf5dll.dll", please ensure'
             ' that it can be found in the system path')
 
     # Some PyTables binary distributions place the dependency DLLs in the
{'fraction_non_alphanumeric': 0.16879450036827892, 'fraction_numerical': 0.07893444635403879, 'mean_word_length': 2.6864253393665156, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 9, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 9, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6784446', 'n_tokens_mistral': 3612, 'n_tokens_neox': 3229, 'n_words': 635}