Skip to content

Fixes for FreeBSD and Arch Linux compatibility #11

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
jckarter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for FreeBSD and Arch Linux compatibility #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/fssimplewindow/src/glx/fsglxwrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void FsResizeWindow(int newWid,int newHei)

int FsCheckWindowOpen(void)
{
if(ysXWnd!=NULL)
if(ysXWnd!=0)
{
return 1;
}
Expand Down Expand Up @@ -456,7 +456,7 @@ void FsSetWindowTitle(const char windowTitle[])

void FsPollDevice(void)
{
if(NULL==ysXWnd)
if(0==ysXWnd)
{
return;
}
Expand Down
12 changes: 6 additions & 6 deletions src/fssimplewindow/src/nownd/fssimplenowindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <dirent.h>
#include <fcntl.h>
#include <unistd.h>
#include <termio.h>
#include <termios.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
Expand All @@ -74,7 +74,7 @@ static int mapFSKEYtoVK[FSKEY_NUM_KEYCODE];
#ifdef __APPLE__
static struct sgttyb OriginalConsoleSetting;
#elif !defined(_WIN32)
struct termio OriginalConsoleSetting;
struct termios OriginalConsoleSetting;
#endif


Expand Down Expand Up @@ -242,7 +242,7 @@ static void Restore(int)
#elif defined(__APPLE__)
ioctl(fileno(stdin),TIOCSETP,&OriginalConsoleSetting);
#else
ioctl(0,TCSETA,&OriginalConsoleSetting);
tcsetattr(0, TCSANOW, &OriginalConsoleSetting);
#endif
printf("%s %d\n",__FUNCTION__,__LINE__);
exit(0);
Expand All @@ -263,14 +263,14 @@ static void FsSetUpInkeyConsole(void)
inkey.sg_flags&=~ECHO;
ioctl(fileno(stdin),TIOCSETP,&inkey);
#else
struct termio inkey;
ioctl(0,TCGETA,&OriginalConsoleSetting);
struct termios inkey;
tcgetattr(0, &OriginalConsoleSetting);
inkey=OriginalConsoleSetting;
inkey.c_lflag&=~ECHO;
inkey.c_lflag&=~ICANON;
inkey.c_cc[VMIN]=0; /* Zero wait */
inkey.c_cc[VTIME]=0; /* Wait 0 second */
ioctl(0,TCSETA,&inkey);
tcsetattr(0, TCSANOW, &inkey);
#endif
}

Expand Down
1 change: 1 addition & 0 deletions src/yssocket/src/yssocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ typedef int socklen_t;
#else
#include <unistd.h>
#include <netdb.h>
#include <netinet/in.h>
#include <strings.h>
#include <arpa/inet.h>
#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion src/yssystemfont/src/linux/ysunixsystemfont.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ YsSystemFontCache::InternalData::InternalData()
}

dsp=NULL;
rootWin=NULL;
rootWin=0;
fontSet=NULL;

dsp=XOpenDisplay(NULL);
Expand Down