Skip to content

Fix header issues so libpal compiles under os X (mainly system vs pro… #1

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
lroathe wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix header issues so libpal compiles under os X (mainly system vs pro… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c58dab8
Fix header issues so libpal compiles under os X (mainly system vs pro…
lroathe-quicken Nov 13, 2019
0caf35d
Fix warnings
lroathe-quicken Nov 13, 2019
b5c58e2
Merge branch 'master' of github.com:marketideas/libpal
lroathe-quicken Nov 13, 2019
66cafa9
removing unused code
marketideas Nov 16, 2019
81dadde
added ifdef for terminal settings
marketideas Nov 19, 2019
c5e3cf2
Fix warnings about type conversions
lroathe-quicken Dec 11, 2019
4024fe3
Merge branch 'master' of github.com:marketideas/libpal
lroathe-quicken Dec 11, 2019
8d7d2fd
Merge branch 'sgq_libpal_main' of github.com:marketideas/libpal
lroathe-quicken Dec 11, 2019
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
7 changes: 4 additions & 3 deletions cmake/CMakeHeader.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ project(${PROJECT_ID})
set(PROJECT_NAME ${PROJECT_ID})
set(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR})

set(DEBUG_OPT "-D_DEBUG -DDEBUG -Wall -Wextra -Werror -Wno-unused-parameter -O0 -g3" )
set(RELEASE_OPT "-Wall -Wextra -Werror -Wno-unused-parameter -O3" )
#set(DEBUG_OPT "-D_DEBUG -DDEBUG -Wall -fmax-errors=3 -Werror -O0 -g3" )
set(DEBUG_OPT "-D_DEBUG -DDEBUG -Wall -Wextra -Werror -O0 -g3" )
set(RELEASE_OPT "-Wall -Wextra -Werror -O3" )

set(CMAKE_CXX_FLAGS_DEBUG "${DEBUG_OPT} ")
set(CMAKE_CXX_FLAGS_RELEASE "${RELEASE_OPT} ")
set(CMAKE_CXX_FLAGS_RELEASE "${RELEASE_OPT}")
3 changes: 2 additions & 1 deletion include/pal/baseapp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@ class TQA_SignalHandler : public Poco::SignalHandler
class CLASS : public POCOAPP_CLASS
{
private:
#ifndef NOT_TTY_SETUP
struct termios oldSettings, newSettings;

#endif
void ResetTerminal(void);
void SetTerminal(void);

Expand Down
12 changes: 9 additions & 3 deletions src/baseapp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,22 @@ bool CLASS::InitApp(void)

void CLASS::SetTerminal(void)
{
#ifndef NO_TTY_SETUP
tcgetattr( fileno( stdin ), &oldSettings );
memcpy(&newSettings, &oldSettings, sizeof(oldSettings));
newSettings.c_lflag &= (~ICANON & ~ECHO);
tcsetattr( fileno( stdin ), TCSANOW, &newSettings );
#else
memcpy(&newSettings, &oldSettings, sizeof(oldSettings));

#endif
}

void CLASS::ResetTerminal(void)
{
#ifndef NO_TTY_SETUP
tcsetattr( fileno( stdin ), TCSANOW, &oldSettings );

#endif
}

char CLASS::getKey(void)
Expand All @@ -297,7 +303,7 @@ char CLASS::getKey(void)
if ( r > 0 )
{
char c;
int x = read( fileno( stdin ), &c, 1 );
int x = (int)read( fileno( stdin ), &c, 1 );
if (x == 1)
{
res = c;
Expand Down Expand Up @@ -469,4 +475,4 @@ int CLASS::runApp(void)
return (res);
}

}
}
4 changes: 2 additions & 2 deletions src/eventtask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void CLASS::SendMessage(Poco::Notification::Ptr ptr)

uint32_t CLASS::setTimer(uint32_t ms)
{
uint32_t res = timermax;
uint32_t res = (uint32_t)timermax;
timermax = ms;
timerval = 0; // reset the timer
return (res);
Expand Down Expand Up @@ -426,4 +426,4 @@ void CLASS::stopAll(void)
}

#undef CLASS
}
}
2 changes: 1 addition & 1 deletion src/palutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ std::string SubstEnvironment(std::string instr)
res = "";

state = 0;
len = instr.length();
len = (uint32_t)instr.length();
for (i = 0; i < len; i++)
{
ch = instr[i];
Expand Down