summaryrefslogtreecommitdiff
path: root/ncurses/tinfo/lib_baudrate.c
diff options
context:
space:
mode:
Diffstat (limited to 'ncurses/tinfo/lib_baudrate.c')
-rw-r--r--ncurses/tinfo/lib_baudrate.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 311c41ac97fa..3a2537e1af6e 100644
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright 2020 Thomas E. Dickey *
+ * Copyright 2020-2024,2025 Thomas E. Dickey *
* Copyright 1998-2016,2017 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
@@ -84,7 +84,7 @@
#undef USE_OLD_TTY
#endif /* USE_OLD_TTY */
-MODULE_ID("$Id: lib_baudrate.c,v 1.45 2020/09/05 21:15:32 tom Exp $")
+MODULE_ID("$Id: lib_baudrate.c,v 1.50 2025/12/23 09:21:42 tom Exp $")
/*
* int
@@ -99,7 +99,7 @@ struct speed {
int actual_speed; /* the actual speed */
};
-#if !defined(EXP_WIN32_DRIVER)
+#if !defined(USE_WIN32CON_DRIVER)
#define DATA(number) { B##number, number }
static struct speed const speeds[] =
@@ -189,12 +189,12 @@ static struct speed const speeds[] =
#endif
#endif
};
-#endif /* !EXP_WIN32_DRIVER */
+#endif /* !USE_NAMED_PIPES */
NCURSES_EXPORT(int)
_nc_baudrate(int OSpeed)
{
-#if defined(EXP_WIN32_DRIVER)
+#if defined(USE_WIN32CON_DRIVER)
/* On Windows this is a noop */
(void) OSpeed;
return (OK);
@@ -237,14 +237,14 @@ _nc_baudrate(int OSpeed)
#endif
}
return (result);
-#endif /* !EXP_WIN32_DRIVER */
+#endif /* !USE_NAMED_PIPES */
}
NCURSES_EXPORT(int)
_nc_ospeed(int BaudRate)
{
int result = 1;
-#if defined(EXP_WIN32_DRIVER)
+#if defined(USE_WIN32CON_DRIVER)
(void) BaudRate;
#else
if (BaudRate >= 0) {
@@ -268,7 +268,8 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
T((T_CALLED("baudrate(%p)"), (void *) SP_PARM));
-#if defined(EXP_WIN32_DRIVER)
+#if defined(USE_WIN32CON_DRIVER)
+ (void) SP_PARM;
result = OK;
#else
/*
@@ -279,7 +280,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
#ifdef TRACE
if (IsValidTIScreen(SP_PARM)
&& !NC_ISATTY(fileno((SP_PARM && SP_PARM->_ofp) ? SP_PARM->_ofp : stdout))
- && getenv("BAUDRATE") != 0) {
+ && getenv("BAUDRATE") != NULL) {
int ret;
if ((ret = _nc_getenv_num("BAUDRATE")) <= 0)
ret = 9600;
@@ -304,7 +305,7 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0)
} else {
result = ERR;
}
-#endif /* !EXP_WIN32_DRIVER */
+#endif /* !USE_NAMED_PIPES */
returnCode(result);
}