Menu

xfig Merge Request #1: Fix prototypes for modern C (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Mario Haustein wants to merge 8 commits from /u/hamarituc/xfig/ to master, 2025-04-02

This MR fixes function callback prototypes such that Xfig will build with modern C compilers. I tested this patch set during the last 2 months in production and didn't notice any misbehavior.

Commit Date  
[6228b7] (prototypes) by Mario Haustein Mario Haustein

Fix miscellaneous prototypes

2025-02-02 21:29:33 Tree
[4239b9] by Mario Haustein Mario Haustein

Fix X callback prototypes

2025-02-02 21:14:10 Tree
[4c32a8] by Mario Haustein Mario Haustein

Fix prototypes for manipulation callbacks

2025-02-02 16:37:11 Tree
[99d4f5] by Mario Haustein Mario Haustein

Fix prototypes for moving callbacks

2025-02-01 21:10:05 Tree
[1423ba] by Mario Haustein Mario Haustein

Remove obsolete declarations

2025-02-01 09:03:11 Tree
[af8f91] by Mario Haustein Mario Haustein

Fix old style definitions

2025-02-01 08:50:16 Tree
[74febf] by Mario Haustein Mario Haustein

Fix prototypes for keyboard callbacks

2025-01-31 23:23:21 Tree
[ff4c37] by Mario Haustein Mario Haustein

Fix prototypes for mouse button callbacks

2025-01-31 22:43:14 Tree

Discussion

  • tkl

    tkl - 2025-04-01

    Please, first pull the actual state of master on xfig and rebase the branch prototypes on it
    On the xfig repository, if tried to merge into a temporary branch based on master. This gave plenty of "Auto-merging ..." messages, indicating that the commits do not introduce new changes, and some merge conflicts.

    git switch master
    git branch prototypes
    git pull git://git.code.sf.net/u/hamarituc/xfig prototypes
    
     
  • Mario Haustein

    Mario Haustein - 2025-04-01

    After rebasing I learnt you already had cherry-picked my commits during February after the discussion in https://sourceforge.net/p/mcj/fig2dev/merge-requests/1/. So this merge request if effectively empty. Sorry for the noise.

     
  • tkl

    tkl - 2025-04-02
    • Status: open --> merged
     
  • tkl

    tkl - 2025-04-02

    Yes, I pulled the changes for xfig from the repository given in https://sourceforge.net/p/mcj/fig2dev/merge-requests/1/. I set the status of this merge request to "merged", since it's content is now contained in xfig.

     

Log in to post a comment.

Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.