bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'SIGAR-146'

This commit is contained in:
Doug MacEachern 2009-05-13 17:31:30 -07:00
parent a95b8a8b60 c43b43ae03
commit 1f8db9098a
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/java/hyperic_jni/jni-build.xml
View File

@ -443,6 +443,7 @@ USA.
<!-- AIX --> <!-- AIX -->
<compiler name="xlc_r" if="aix"> <compiler name="xlc_r" if="aix">
<compilerarg value="-q64" if="jni.arch64"/>
<defineset> <defineset>
<define name="${jni.define.name}_AIX"/> <define name="${jni.define.name}_AIX"/>
<define name="_ALL_SOURCE"/> <define name="_ALL_SOURCE"/>
@ -452,6 +453,7 @@ USA.
</compiler> </compiler>
<linker name="xlc_r" if="aix"> <linker name="xlc_r" if="aix">
<linkerarg value="-b64" if="jni.arch64"/>
<libset if="jni.libset.libs" <libset if="jni.libset.libs"
dir="${jni.libset.dir}" dir="${jni.libset.dir}"
libs="${jni.libset.libs}"/> libs="${jni.libset.libs}"/>

BIN
bindings/java/hyperic_jni/lib/cpptasks.jar
View File

Binary file not shown.

2
src/os/aix/sigar_os.h
View File

@ -66,6 +66,6 @@ struct sigar_t {
#define HAVE_STRERROR_R #define HAVE_STRERROR_R
#define SIGAR_EPERM_KMEM (SIGAR_OS_START_ERROR+1) #define SIGAR_EPERM_KMEM (SIGAR_OS_START_ERROR+EACCES)
#endif /* SIGAR_OS_H */ #endif /* SIGAR_OS_H */