other: merge 3.0
This commit is contained in:
parent
0a37d4641f
commit
5a4fd268f2
|
@ -18,10 +18,6 @@
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
|
|
||||||
#if defined(WINDOWS)
|
#if defined(WINDOWS)
|
||||||
BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) {
|
|
||||||
printf("\n" TAOS_CONSOLE_PROMPT_HEADER);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
#elif defined(_TD_DARWIN_64)
|
#elif defined(_TD_DARWIN_64)
|
||||||
#else
|
#else
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
@ -128,7 +124,6 @@ int taosSetConsoleEcho(bool on) {
|
||||||
|
|
||||||
void taosSetTerminalMode() {
|
void taosSetTerminalMode() {
|
||||||
#if defined(WINDOWS)
|
#if defined(WINDOWS)
|
||||||
SetConsoleCtrlHandler(CtrlHandler, TRUE);
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
struct termios newtio;
|
struct termios newtio;
|
||||||
|
@ -179,7 +174,6 @@ int32_t taosGetOldTerminalMode() {
|
||||||
|
|
||||||
void taosResetTerminalMode() {
|
void taosResetTerminalMode() {
|
||||||
#if defined(WINDOWS)
|
#if defined(WINDOWS)
|
||||||
SetConsoleCtrlHandler(CtrlHandler, FALSE);
|
|
||||||
#else
|
#else
|
||||||
if (tcsetattr(0, TCSANOW, &oldtio) != 0) {
|
if (tcsetattr(0, TCSANOW, &oldtio) != 0) {
|
||||||
fprintf(stderr, "Fail to reset the terminal properties!\n");
|
fprintf(stderr, "Fail to reset the terminal properties!\n");
|
||||||
|
|
Loading…
Reference in New Issue