Skip to content

Stop using K&R C features that have been removed #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tueda merged 1 commit into from
Jan 20, 2026
Merged

Stop using K&R C features that have been removed #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sources/evaluate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/

#include "form3.h"
#include <stdarg.h>
#include <gmp.h>
#include <mpfr.h>

Expand Down
3 changes: 0 additions & 3 deletions sources/form3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,16 +292,13 @@ template<typename T> struct calc {
#include <string.h>
#include <ctype.h>
#include <limits.h>
#ifdef ANSI
#include <stdarg.h>
#include <time.h>
#endif
#ifdef WINDOWS
#include "fwin.h"
#endif
#ifdef UNIX
#include <unistd.h>
#include <time.h>
#include <fcntl.h>
#include <sys/file.h>
#include "unix.h"
Expand Down
13 changes: 0 additions & 13 deletions sources/ftypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,11 @@
The typedefs are to allow the compilers to do better error checking.
*/

#ifdef ANSI
typedef void (*PVFUNWP)(WORD *);
#ifdef INTELCOMPILER
typedef void (*PVFUNV)();
typedef int (*CFUN)();
#else
typedef void (*PVFUNV)(void);
typedef int (*CFUN)(void);
#endif
typedef int (*TFUN)(UBYTE *);
typedef int (*TFUN1)(UBYTE *,int);
#else
typedef void (*PVFUNWP)();
typedef void (*PVFUNV)();
typedef int (*CFUN)();
typedef int (*TFUN)();
typedef int (*TFUN1)();
#endif


#define NOAUTO 0
Expand Down
13 changes: 1 addition & 12 deletions sources/message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,7 @@ int MesWork(void)
the tabulator in the print "" statement.
*/

int
#ifdef ANSI
MesPrint(const char *fmt, ... )
#else
MesPrint(va_alist)
va_dcl
#endif
int MesPrint(const char *fmt, ... )
{
GETIDENTITY
char Out[MAXLINELENGTH+14], *stopper, *t, *s, *u, c, *carray;
Expand All @@ -152,13 +146,8 @@ va_dcl
LONG (*OldWrite)(int handle, UBYTE *buffer, LONG size) = WriteFile;
/*:[19apr2004 mt]*/
va_list ap;
#ifdef ANSI
va_start(ap,fmt);
s = (char *)fmt;
#else
va_start(ap);
s = va_arg(ap,char *);
#endif
#ifdef WITHMPI
/*
* On slaves, if AS.printflag is
Expand Down
18 changes: 0 additions & 18 deletions sources/sch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,6 @@

#include "form3.h"

#ifdef ANSI
#include <stdarg.h>
#else
#ifdef mBSD
#include <varargs.h>
#else
#ifdef VMS
#include <varargs.h>
#else
typedef UBYTE *va_list;
#define va_dcl int va_alist;
#define va_start(list) list = (UBYTE *) &va_alist
#define va_end(list)
#define va_arg(list,mode) (((mode *)(list += sizeof(mode)))[-1])
#endif
#endif
#endif

static int startinline = 0;
static char fcontchar = '&';
static int noextralinefeed = 0;
Expand Down
5 changes: 0 additions & 5 deletions sources/structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2497,13 +2497,8 @@ typedef struct AllGlobals {
#define BHEAD0
#endif

#ifdef ANSI
typedef int (*WCN)(PHEAD WORD *,WORD *,WORD,WORD);
typedef int (*WCN2)(PHEAD WORD *,WORD *);
#else
typedef int (*WCN)();
typedef int (*WCN2)();
#endif

typedef WORD (*COMPARE)(PHEAD WORD *,WORD *,WORD);

Expand Down
13 changes: 2 additions & 11 deletions sources/tools.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,29 +2081,20 @@ char *LongLongCopy(off_t *y, char *to)
Routine produces a string with the date and time of the run
*/

#ifdef ANSI
#else
#ifdef mBSD
#if defined(ANSI) || defined(mBSD)
#else
static char notime[] = "";
#endif
#endif

UBYTE *MakeDate(void)
{
#ifdef ANSI
time_t tp;
time(&tp);
return((UBYTE *)ctime(&tp));
#else
#ifdef mBSD
#if defined(ANSI) || defined(mBSD)
time_t tp;
time(&tp);
return((UBYTE *)ctime(&tp));
#else
return((UBYTE *)notime);
#endif
#endif
}

/*
Expand Down
Loading