Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Add 64-bit mingw-w64 to the PATH
run: |
echo "c:/msys64/bin;c:/msys64/mingw64/bin" >> $GITHUB_PATH
Expand Down
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ DBG ?= -g
OPTIM ?= -O2
LFLAGS = -t
MYLDFLAGS = $(LDFLAGS) $(DBG)
MYCFLAGS = $(OPTIM) $(DBG) $(CFLAGS) #-Wall
MYCFLAGS = -D_GNU_SOURCE $(OPTIM) $(DBG) $(CFLAGS) -ansi -Wall
MYCXXFLAGS = $(MYCFLAGS)
LDADD = -lstdc++ -lfl

.SUFFIXES:
.SUFFIXES: .l .c .C .o

GENSRCS = mcstrip.c scan.c
BLDSRCS = lib.C main.C strerror.c
MCSOBJS = mcstrip.o strerror.o
BLDSRCS = lib.C main.C
MCSOBJS = mcstrip.o
CYCOBJS = main.o lib.o
SCNOBJS = scan.o

Expand Down Expand Up @@ -117,9 +117,7 @@ install-targets: make-install-dirs
$(INSTALL_DATA) mccabe.example $(DOCDIR)

clean:
$(RM) cyclo mcstrip core *.o *~
$(RM) cyclo mcstrip core *.o *~ *.metrics *.preproc *.stripped

cleanall: clean
$(RM) $(GENSRCS)


4 changes: 2 additions & 2 deletions Makefile.test
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ LDADD = -lstdc++ -lfl
.SUFFIXES: .o .c .C .l

GENSRCS = mcstrip.c scan.c
BLDSRCS = lib.C main.C strerror.c
MCSOBJS = mcstrip.o strerror.o
BLDSRCS = lib.C main.C
MCSOBJS = mcstrip.o
CYCOBJS = main.o lib.o
SCNOBJS = scan.o

Expand Down
2 changes: 1 addition & 1 deletion list.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ third party claims) arising therefrom.
// NOTE: _LIST_CLASSTYPE should be a text only single token. Use typedefs.

#ifndef COREDUMP
#define COREDUMP *((char*)0)=0 // causes a segmentation fault (only under UNIX)
#define COREDUMP *((volatile char*)0)=0 // causes a segmentation fault (only under UNIX)
#endif

#ifndef _LIST_CLASSNAME
Expand Down
1 change: 0 additions & 1 deletion mcstrip.l
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ extern int getopt();
#include <errno.h>
#include <string.h>

#include "strerror.h"

/* this aren't declared yet */
int yylex();
Expand Down
2 changes: 1 addition & 1 deletion stack.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ third party claims) arising therefrom.
// NOTE: _STACK_TYPE should be a text only single token. Use typedefs.

#ifndef COREDUMP
#define COREDUMP *((char*)0)=0 // causes a segmentation fault (only under UNIX)
#define COREDUMP *((volatile char*)0)=0 // causes a segmentation fault (only under UNIX)
#endif

#ifndef _STACK_CLASSNAME
Expand Down