summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-03-17 14:23:02 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-03-17 14:23:02 (GMT)
commite54ede09769b614f82c70236e17a542d674f9724 (patch)
treefa01fcf55e42cbf4d56b3a6e7c65e6540d0c6332
parentebd388882bc49e77234580e1efd0a77e6bed3171 (diff)
downloadhdf5-e54ede09769b614f82c70236e17a542d674f9724.zip
hdf5-e54ede09769b614f82c70236e17a542d674f9724.tar.gz
hdf5-e54ede09769b614f82c70236e17a542d674f9724.tar.bz2
[svn-r20265] Cleanup due to project file syncing with 1.8 branch
-rw-r--r--windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj14
-rw-r--r--windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj21
-rw-r--r--windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj10
-rw-r--r--windows/proj/hdf5_hldll/hdf5_hldll.vcproj10
-rwxr-xr-xwindows/src/H5pubconf.h5
5 files changed, 10 insertions, 50 deletions
diff --git a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
index 561f878..2938143 100644
--- a/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
+++ b/windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj
@@ -321,18 +321,8 @@
<References>
</References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
- >
- <File
- RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
+ <File
+ RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"
>
</Filter>
</Files>
diff --git a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
index 251c4fa..cc485aa 100644
--- a/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
+++ b/windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj
@@ -400,25 +400,10 @@
<References>
</References>
<Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+ <File
+ RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"
>
- <File
- RelativePath="..\..\..\hl\c++\src\H5PacketTable.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
index e524321..9ae1c76 100644
--- a/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
+++ b/windows/proj/hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj
@@ -419,16 +419,6 @@
>
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
index 91554f2..c42533f 100644
--- a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
+++ b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj
@@ -435,16 +435,6 @@
>
</File>
</Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 0a6ce30..5742a9a 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -54,6 +54,10 @@
/* As FC_FUNC, but for C identifiers containing underscores. */
#define H5_FC_FUNC_(name,NAME) NAME
+/* LAHEY compiler for C identifiers containing underscores. */
+/* #define H5_FC_FUNC(name,NAME) name ## _ */
+/* #define H5_FC_FUNC_(name,NAME) name ## _ */
+
/* Define if your system can handle overflow converting floating-point to
integer values. */
#define H5_FP_TO_INTEGER_OVERFLOW_WORKS 1
@@ -108,6 +112,7 @@
/* #undef H5_HAVE_FEATURES_H */
/* Define if support for deflate (zlib) filter is enabled */
+#define H5_HAVE_FILTER_DEFLATE 1
/* Define if support for Fletcher32 checksum is enabled */
#define H5_HAVE_FILTER_FLETCHER32 1