[libfann] 45/242: Fixed a conflict when <errno.h> was included.

[Christian Kastner]

This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to tag Version2_0_0
in repository libfann.

commit 9543aa7866e2e35e38fb57e8e4fcb3fc714672c1
Author: Evan Nemerson <evan at coeus-group.com>
Date:   Mon Jan 12 09:50:15 2004 +0000

    Fixed a conflict when <errno.h> was included.
---
 src/fann.c              | 6 +++---
 src/include/fann_data.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fann.c b/src/fann.c
index 5e60b95..f9b0f59 100644
--- a/src/fann.c
+++ b/src/fann.c
@@ -1021,7 +1021,7 @@ fann_type* fann_run(struct fann *ann, fann_type *input)
  */
 void fann_reset_errno(struct fann *ann)
 {
-	ann->errno = 0;
+	ann->errno_f = 0;
 }
 
 /* resets the last errstr
@@ -1037,7 +1037,7 @@ void fann_reset_errstr(struct fann *ann)
  */
 unsigned int fann_get_errno(struct fann *ann)
 {
-	return ann->errno;
+	return ann->errno_f;
 }
 
 /* returns the last errstr
@@ -1055,7 +1055,7 @@ char * fann_get_errstr(struct fann *ann)
 /* prints the last error to stderr
  */
 void fann_print_error(struct fann *ann) {
-	if ( ann->errno != FANN_E_NO_ERROR ){
+	if ( ann->errno_f != FANN_E_NO_ERROR ){
 		fputs(ann->errstr, stderr);
 	}
 }
diff --git a/src/include/fann_data.h b/src/include/fann_data.h
index 168b92b..d861a4f 100644
--- a/src/include/fann_data.h
+++ b/src/include/fann_data.h
@@ -145,7 +145,7 @@ struct fann
 	float error_value;
 
 	/* The type of error that last occured. */
-	unsigned int errno;
+	unsigned int errno_f;
 
 	/* A string representation of the last error. */
 	char * errstr;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git