[med-svn] [Git][med-team/acedb][master] Definition of AceType is broken since it redefines _Int with different meaning...

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / acedb


Commits:
20341e99 by Andreas Tille at 2024-12-14T18:07:17+01:00
Definition of AceType is broken since it redefines _Int with different meaning than in whooks/systags.h

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gcc-14.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,10 @@
 acedb (4.9.39+dfsg.02-10) UNRELEASED; urgency=medium
 
   [ Andreas Tille ]
-  * Add missing readline/history.h header
+  * Fix gcc-14 build issues
+     - Add missing readline/history.h header
+     - Definition of AceType is broken since it redefines _Int with different
+       meaning than in whooks/systags.h
     Closes: #1066334
   * Build-Depends: libtirpc-dev
 


=====================================
debian/patches/gcc-14.patch
=====================================
@@ -0,0 +1,65 @@
+Desription:
+            - Definition of AceType is broken since it redefines _Int with different meaning than in whooks/systags.h
+              -> its not used anyway so remove all instances
+
+--- a/w1/acein.c
++++ b/w1/acein.c
+@@ -44,10 +44,8 @@
+ #include <wh/version.h>
+ #include <wh/call.h>
+ 
+-#ifndef NO_READLINE
+ #include <readline/readline.h>
+ #include <readline/history.h>
+-#endif /*NO_READLINE */
+ 
+ /* #define DEBUG_STREAMLEVEL */
+ 
+--- a/wh/acelib.h
++++ b/wh/acelib.h
+@@ -439,10 +439,7 @@ Bool    aceHasTag( AceInstance, AceKey t
+ Bool    aceNextChild( AceInstance );
+ Bool    aceGotoChild( AceInstance );
+ /* verify the current type */
+-Bool    aceCheckType( AceInstance , AceType );
+-AceType aceGetType( AceInstance );
+ /* verify the presence of a type in the current follow set */
+-Bool    aceFollowedBy( AceInstance , AceType );
+ 
+ Bool aceGetTag (AceInstance ai, AceKey *xk) ;
+ Bool aceGetKey (AceInstance ai, AceKey *xk) ;
+--- a/wh/acetypes.h
++++ b/wh/acetypes.h
+@@ -33,7 +33,6 @@
+ #ifndef ACETYPES_H
+ #define ACETYPES_H
+ 
+-typedef enum { _Int, _Text, _Float, _DateType, _Key, _Tag } AceType;
+ typedef enum 
+ { OK=0, 
+   NOCONTEXTERR,
+--- a/wnq/acelib.c
++++ b/wnq/acelib.c
+@@ -1375,11 +1375,7 @@ Bool aceGotoChild (AceInstance ai)
+   return aceGotoTag (ai,_bsRight) ;
+ }
+ 
+-/* verify the current type */
+-Bool    aceCheckType( AceInstance , AceType );
+-AceType aceGetType( AceInstance );
+ /* verify the presence of a type in the current follow set */
+-Bool    aceFollowedBy( AceInstance , AceType );
+ 
+ Bool aceGetTag (AceInstance ai, AceKey *xkp)
+ {
+--- a/w4/picksubs.c
++++ b/w4/picksubs.c
+@@ -294,7 +294,7 @@ void pickGetClassProperties (BOOL readDi
+   char *cp, *filename ;
+   ACEIN options_in;
+   KEY tag , option, dummy ;
+-  static displayOK = FALSE;
++  static int displayOK = FALSE;
+ 
+   if (readDisplayTypeOK)
+     displayOK = TRUE;


=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@ glibc2.38.patch
 fix_implicit_declaration.patch
 acedb-parser-fixes.patch
 acedb-signal-fix.patch
+gcc-14.patch



View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/20341e99e2b2a4d9f0b61f675a1702c9ac71e6b7

-- 
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/20341e99e2b2a4d9f0b61f675a1702c9ac71e6b7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20241214/94e2ed1e/attachment-0001.htm>