Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
019aeb20
Commit
019aeb20
authored
6 months ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Apparently, Windows headers define (at least) PARITY_NONE
Even when "lean and mean". Rename enum.
parent
4eff99e9
No related branches found
No related tags found
No related merge requests found
Pipeline
#7207
canceled
6 months ago
Stage: build
Stage: test
Stage: cleanup
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/syncterm/CHANGES
+1
-0
1 addition, 0 deletions
src/syncterm/CHANGES
src/syncterm/bbslist.c
+1
-1
1 addition, 1 deletion
src/syncterm/bbslist.c
src/syncterm/bbslist.h
+3
-3
3 additions, 3 deletions
src/syncterm/bbslist.h
src/syncterm/modem.c
+2
-2
2 additions, 2 deletions
src/syncterm/modem.c
with
7 additions
and
6 deletions
src/syncterm/CHANGES
+
1
−
0
View file @
019aeb20
...
...
@@ -9,6 +9,7 @@ Fix crash when editing blank "extra" bbslist entry
Support copy/paste in BBS list
Show current list path, not default in File Locations
Explicitly set serial port to 8N1
Add support bit data bits, stop bits, and parity
Version 1.2rc6
--------------
...
...
This diff is collapsed.
Click to expand it.
src/syncterm/bbslist.c
+
1
−
1
View file @
019aeb20
...
...
@@ -822,7 +822,7 @@ read_item(str_list_t listfile, struct bbslist *entry, char *bbsname, int id, int
entry
->
stop_bits
=
iniGetUShortInt
(
section
,
NULL
,
"StopBits"
,
1
);
if
(
entry
->
stop_bits
<
1
||
entry
->
stop_bits
>
2
)
entry
->
stop_bits
=
1
;
entry
->
parity
=
iniGetEnum
(
section
,
NULL
,
"Parity"
,
parity_enum
,
PARITY_NONE
);
entry
->
parity
=
iniGetEnum
(
section
,
NULL
,
"Parity"
,
parity_enum
,
SYNCTERM_
PARITY_NONE
);
/* Log Stuff */
iniGetSString
(
section
,
NULL
,
"LogFile"
,
""
,
entry
->
logfile
,
sizeof
(
entry
->
logfile
));
...
...
This diff is collapsed.
Click to expand it.
src/syncterm/bbslist.h
+
3
−
3
View file @
019aeb20
...
...
@@ -110,9 +110,9 @@ enum {
};
enum
{
PARITY_NONE
,
PARITY_EVEN
,
PARITY_ODD
,
SYNCTERM_
PARITY_NONE
,
SYNCTERM_
PARITY_EVEN
,
SYNCTERM_
PARITY_ODD
,
};
/* NOTE: changing this may require updating sort_order in bbslist.c */
...
...
This diff is collapsed.
Click to expand it.
src/syncterm/modem.c
+
2
−
2
View file @
019aeb20
...
...
@@ -164,7 +164,7 @@ modem_connect(struct bbslist *bbs)
return
-
1
;
}
}
if
(
!
comSetParity
(
com
,
bbs
->
parity
!=
PARITY_NONE
,
bbs
->
parity
==
PARITY_ODD
))
{
if
(
!
comSetParity
(
com
,
bbs
->
parity
!=
SYNCTERM_
PARITY_NONE
,
bbs
->
parity
==
SYNCTERM_
PARITY_ODD
))
{
if
(
!
bbs
->
hidepopups
)
uifcmsg
(
"Cannot Set Parity"
,
"`Cannot Set Parity`
\n\n
"
"Cannot open the specified serial device.
\n
"
);
...
...
@@ -209,7 +209,7 @@ modem_connect(struct bbslist *bbs)
return
-
1
;
}
}
if
(
!
comSetParity
(
com
,
bbs
->
parity
!=
PARITY_NONE
,
bbs
->
parity
==
PARITY_ODD
))
{
if
(
!
comSetParity
(
com
,
bbs
->
parity
!=
SYNCTERM_
PARITY_NONE
,
bbs
->
parity
==
SYNCTERM_
PARITY_ODD
))
{
if
(
!
bbs
->
hidepopups
)
uifcmsg
(
"Cannot Set Parity"
,
"`Cannot Set Parity`
\n\n
"
"Cannot open the specified serial device.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment