Skip to content

More Linux build improvements #3

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

More Linux build improvements #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b5061c
Fix another min/max/MIN/MAC call
wrljet Dec 22, 2022
237d2b7
Correct duplicate definition errors with newer gcc
wrljet Dec 22, 2022
c2de6ef
Merge remote-tracking branch 'upstream/master'
wrljet Jul 9, 2023
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
2 changes: 1 addition & 1 deletion simh-master/I701/i701_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ typedef struct {
t_int64 ReadyTickCount; // value of GlobalTickCount (=simulated time) when tape will be ready to accept command
} mtinforec;
// extended info for tapes. Holds detailed info of tape command operation
mtinforec mt_info[4];
extern mtinforec mt_info[4];


extern char digits_ascii[31];
Expand Down
2 changes: 1 addition & 1 deletion simh-master/IBM360/ibm360_cpanel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3536,7 +3536,7 @@ void mt_TapeMediumToReelDynamicState(uint32 * surface, int pitch, int ireel, int
x1=xyreelcentre[base][ireel*2] +x1 * ( (ireel == 0) ? 1:-1);
y1=xyreelcentre[base][ireel*2+1]+y1;

yH=max(y0, y1);
yH=MAX(y0, y1);
// colors to not overdraw
col_reel= surface_rgb_color(55, 55, 55) ; // color for tape medium winded on reel
if (bTapeIs == 3420) {
Expand Down
2 changes: 1 addition & 1 deletion simh-master/IBM360/ibm360_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ typedef struct {
int cmd_tm0; // signal tape cmd animation pending to be done
} mtinforec;
// extended info for tapes. Holds detailed info of tape command operation
mtinforec mt_info[8];
extern mtinforec mt_info[8];

// addr compare info
typedef struct {
Expand Down
2 changes: 2 additions & 0 deletions simh-master/IBM360/ibm360_mt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include "ibm360_defs.h"
#include "sim_tape.h"

mtinforec mt_info[8];

#ifdef NUM_DEVS_MT
#define BUFFSIZE (64 * 1024)
#define MTUF_9TR (1 << MTUF_V_UF)
Expand Down
2 changes: 1 addition & 1 deletion simh-master/NORC/NORC_cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
*/

#include <math.h>
#include "NORC_defs.h"
#include "NORC_defs.h"
#if defined(CPANEL)
#include "cpanel.h"
int cpanel_gui_supported = 1;
Expand Down
2 changes: 1 addition & 1 deletion simh-master/NORC/NORC_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ typedef struct {
} mtinforec;

// extended info for tapes. Holds detailed info of tape command operation
mtinforec mt_info[9];
extern mtinforec mt_info[9];
extern int LastTapeCheck;

// read words from tape
Expand Down
2 changes: 1 addition & 1 deletion simh-master/NORC/NORC_lp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ char lptPrintOut[LPT_COLUMNS * lptPrintOutMAX];
int lptPrintOutCount = 0; // total number of lines printed

// IBM NORC tape/printer control Unit internal state
int bFastMode; // =1 for FAST operation
extern int bFastMode; // =1 for FAST operation

// lpt print routine. If line is NULL prints empty lines
// add CR LF at end of each line
Expand Down
2 changes: 2 additions & 0 deletions simh-master/NORC/NORC_mt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
#include "NORC_defs.h"
#include "sim_tape.h"

mtinforec mt_info[9];

#define UNIT_MT UNIT_ATTABLE | UNIT_ROABLE | UNIT_DISABLE

// Tapes in NORC have address assigned by the console. So tape P can be tied to address 00-12
Expand Down
2 changes: 1 addition & 1 deletion simh-master/NORC/NORC_sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

*/

#include "NORC_defs.h"
#include "NORC_defs.h"
#include "sim_card.h"
#include <ctype.h>

Expand Down