STABLE14-java-errno-header-20090526

LICENSE IPL10
FIXES 124810

use the errno header instead of assuming extern int

(cherry picked from commit 3b2a1ac2b1d4212363527a6edc6dd2aa76a3f960)

diff --git a/src/JAVA/libjafs/ACL.c b/src/JAVA/libjafs/ACL.c
index da9d603075d64d6d00aefac89c75214c2d7829f2..20f0557561e13793c82512eeccfe3f995c249931 100644 (file)
--- a/src/JAVA/libjafs/ACL.c
+++ b/src/JAVA/libjafs/ACL.c
@@ -21,6 +21,7 @@
 
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <errno.h>
 
 #include "Internal.h"
 #include "org_openafs_jafs_ACL.h"
@@ -54,7 +55,12 @@ static char space[MAXSIZE];
 
 #define ACL_LEN      1024
 
-extern int errno;
+#ifndef ERROR_H
+#define ERROR_H
+#endif
+
+extern int error_intr;
+extern int error_nomem;
 
 /**
  * Returns a formatted string representing the ACL for the specified path.

diff --git a/src/JAVA/libjafs/FileInputStream.c b/src/JAVA/libjafs/FileInputStream.c
index 95b9327dd2660d939f1737c215fecb44fa5bc921..180992f769279f542b9a47a7628fa213c5259b2f 100644 (file)
--- a/src/JAVA/libjafs/FileInputStream.c
+++ b/src/JAVA/libjafs/FileInputStream.c
@@ -21,6 +21,7 @@
 
 #include "Internal.h"
 #include "org_openafs_jafs_FileInputStream.h"
+#include <errno.h>
 
 #include <fcntl.h>
 
@@ -28,8 +29,6 @@
 #include "dmalloc.h"
 #endif
 
-extern int errno;
-
 /**
  * Be carefull with the memory management:
  *

diff --git a/src/JAVA/libjafs/Internal.c b/src/JAVA/libjafs/Internal.c
index 5d588d8578f17752041e146e56da0394d400971e..d44ab3204bfcf817440ed71dc003801294af20f4 100644 (file)
--- a/src/JAVA/libjafs/Internal.c
+++ b/src/JAVA/libjafs/Internal.c
@@ -20,13 +20,12 @@
  */
 
 #include "Internal.h"
+#include <errno.h>
 
 #ifdef DMALLOC
 #include "dmalloc.h"
 #endif
 
-extern int errno;
-
 #ifndef LIBJUAFS
 // user class and fields //
 jclass userCls = 0;