[PVFS2-CVS] commit by slang in pvfs2/src/common/statecomp: emalloc.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/common/statecomp
In directory parlweb:/tmp/cvs-serv2348/src/common/statecomp

Modified Files:
      Tag: slang-sio-branch
	emalloc.c 
Log Message:
fixes to small io stuff to get test-zero-fill working again.  Also committing updates from HEAD to make things easier for merge.


Index: emalloc.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/statecomp/emalloc.c,v
diff -p -u -r1.4 -r1.4.18.1
--- emalloc.c	11 Jan 2005 14:00:27 -0000	1.4
+++ emalloc.c	11 Nov 2005 22:19:04 -0000	1.4.18.1
@@ -14,7 +14,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 void *emalloc(unsigned int size);