[Pkg-electronics-commits] [gplcver] 05/18: Imported Debian patch 2.11a-3

[أحمد المحمودي (Ahmed El-Mahmoudy)]

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

aelmahmoudy-guest pushed a commit to branch master
in repository gplcver.

commit 7ae717241cc407edb8e666c1a803cbf7dc1d789c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jan 29 14:35:11 2007 +0900

    Imported Debian patch 2.11a-3
---
 debian/changelog | 6 ++++++
 src/cver.c       | 2 +-
 src/v_dbg2.c     | 8 ++++----
 src/v_ex2.c      | 8 ++++----
 src/v_ms.c       | 8 ++++----
 src/v_sdf.c      | 2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aadb847..274dc03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gplcver (2.11a-3) unstable; urgency=low
+
+  * Fixes FTBFS on Sparc (src/{cver.c,v_sdf.c,v_ex2.c,v_dbg2.c,v_ms.c}).
+
+ -- NIIBE Yutaka <gniibe at fsij.org>  Mon, 29 Jan 2007 14:35:11 +0900
+
 gplcver (2.11a-2) unstable; urgency=low
 
   * Fixes FTBFS on Sparc (src/v_src3.c).
diff --git a/src/cver.c b/src/cver.c
index 94a6d8d..9a6a0bf 100644
--- a/src/cver.c
+++ b/src/cver.c
@@ -1053,7 +1053,7 @@ extern int32 __dig_main(int32 argc, char **argv)
  __platform = __pv_stralloc("Mac OSX");
 #endif
 
-#ifdef __sparc
+#if defined(__sparc) && !defined(__GNU_LIBRARY__)
  __platform = __pv_stralloc("Sparc-Solaris");
 #endif
 #if defined(__i386__) && defined(__SVR4)
diff --git a/src/v_dbg2.c b/src/v_dbg2.c
index 093952c..0dd6f51 100644
--- a/src/v_dbg2.c
+++ b/src/v_dbg2.c
@@ -43,15 +43,15 @@
 #include "../malloc.h"
 #endif
 
+#include "v.h"
+#include "cvmacros.h"
+
 /* REMOVEME - no longer supporting SunOS - maybe needed for hpux? */
-#if defined(__sparc) && !defined(__SVR4)  
+#if defined(__sparc) && !defined(__SVR4) && !defined(__GNU_LIBRARY__)
 extern int32 tolower(int32);
 extern int32 sscanf(char *, char *, ...); 
 #endif
 
-#include "v.h"
-#include "cvmacros.h"
-
 /* local prototypes */
 static void get_middle_linrng(int32, int32 *, int32 *);
 static struct incloc_t *find_incloc(register int32);
diff --git a/src/v_ex2.c b/src/v_ex2.c
index 8f7f274..77952f2 100644
--- a/src/v_ex2.c
+++ b/src/v_ex2.c
@@ -37,15 +37,15 @@
 #include "../malloc.h"
 #endif
 
+#include "v.h"
+#include "cvmacros.h"
+
 /* REMOVEME - no longer supporting SunOS - maybe needed for hpux? */
-#if defined(__sparc) && !defined(__SVR4)  
+#if defined(__sparc) && !defined(__SVR4) && !defined(__GNU_LIBRARY__)
 extern int32 tolower(int32);
 extern ungetc(int32 c, FILE *);
 #endif
 
-#include "v.h"
-#include "cvmacros.h"
-
 /* local prototypes */
 static void prep_bld_monit_dces(struct expr_t *, int32);
 static void linkon_monit_dce(struct net_t *, int32, int32, int32,
diff --git a/src/v_ms.c b/src/v_ms.c
index acdb4c2..a5cf541 100644
--- a/src/v_ms.c
+++ b/src/v_ms.c
@@ -49,16 +49,16 @@
 #include "../malloc.h"
 #endif
 
+#include "v.h"
+#include "cvmacros.h"
+
 /* REMOVEME - no longer supporting SunOS - maybe needed for hpux? */
-#if defined(__sparc) && !defined(__SVR4)  
+#if defined(__sparc) && !defined(__SVR4) && !defined(__GNU_LIBRARY__)
 extern int32 tolower(int32);
 extern ungetc(int32 c, FILE *);
 extern long time (long *);
 #endif
 
-#include "v.h"
-#include "cvmacros.h"
-
 /* local prototypes */
 static char *expand_arg_macro(struct sy_t *, int32 *);
 static void process_macdef(void);
diff --git a/src/v_sdf.c b/src/v_sdf.c
index a3d2233..ef8f03c 100644
--- a/src/v_sdf.c
+++ b/src/v_sdf.c
@@ -42,7 +42,7 @@
 #include "cvmacros.h"
 
 /* REMOVEME - no longer supporting SunOS - maybe needed for hpux? */
-#if defined(__sparc) && !defined(__SVR4)  
+#if defined(__sparc) && !defined(__SVR4) && !defined(__GNU_LIBRARY__)
 extern ungetc(int32 c, FILE *);
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gplcver.git