Revert "Synchronize adm files"

[modules/kernel.git] / src / HDFPersist / HDFattrWrite.c

diff --git a/src/HDFPersist/HDFattrWrite.c b/src/HDFPersist/HDFattrWrite.c
index 61d378427b3b46523592906a96c7a5a3ad697fdb..7bd87cc2734e749f1824a6afdd07fbb6edb5fd2b 100644 (file)
--- a/src/HDFPersist/HDFattrWrite.c
+++ b/src/HDFPersist/HDFattrWrite.c
@@ -1,29 +1,29 @@
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 /*----------------------------------------------------------------------------
 SALOME HDFPersist : implementation of HDF persitent ( save/ restore )
-
- Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
- CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-
- This library is free software; you can redistribute it and/or 
- modify it under the terms of the GNU Lesser General Public 
- License as published by the Free Software Foundation; either 
- version 2.1 of the License. 
-
- This library is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
- Lesser General Public License for more details. 
-
- You should have received a copy of the GNU Lesser General Public 
- License along with this library; if not, write to the Free Software 
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-
- See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
-
-
-
   File   : HDFattrWrite.c
-Module : SALOME
+  Module : SALOME
 ----------------------------------------------------------------------------*/
 
 #include "hdfi.h"
@@ -42,17 +42,17 @@ hdf_err HDFattrWrite(hdf_idt id, void *val)
 {
   hdf_idt type_id;
   int ret = 0;
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   int isI32BE = 0;
 #endif
 
   if ((type_id = H5Aget_type(id)) < 0)
     return -1;
 
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   if((H5Tget_class(type_id) == H5T_INTEGER) && (H5Tget_size(type_id) == 4)) {
     isI32BE = 1; /* See HDFattrCreate */
-    if (H5Tconvert(H5T_NATIVE_INT,H5T_STD_I32BE,1,(void *)val,NULL,NULL) < 0)
+    if (H5Tconvert(H5T_NATIVE_INT,H5T_STD_I32BE,1,(void *)val,NULL,(hid_t)0) < 0)
       return -1;
   }
 #endif
@@ -60,8 +60,8 @@ hdf_err HDFattrWrite(hdf_idt id, void *val)
   ret = H5Awrite(id,type_id, val);
 
 
-#ifdef PCLINUX
-  if (isI32BE && (H5Tconvert(H5T_STD_I32BE,H5T_NATIVE_INT,1,(void *)val,NULL,NULL) < 0)) 
+#if defined (PCLINUX) || defined (PCLINUX64)
+  if (isI32BE && (H5Tconvert(H5T_STD_I32BE,H5T_NATIVE_INT,1,(void *)val,NULL,(hid_t)0) < 0))
     return -1;
 #endif