Skip to content

Commit dc21221

Browse files
committed
Fixed issue related to ACS map not being correctly created on 64-bit systems
Fixed issue where importing deimos.ncurses.ncurses would not pull in the expected functions and values
1 parent e5d8df0 commit dc21221

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

deimos/ncurses/curses.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ module deimos.ncurses.curses;
4141
import std.c.stdio;
4242
import std.c.stddef; /* we want wchar_t */
4343
import std.c.stdarg; /* we need va_list */
44+
import core.stdc.config; /* we need c_ulong */
4445

4546
//#include <ncursesw/unctrl.h>
4647
public import deimos.ncurses.unctrl;
@@ -68,10 +69,9 @@ string NCURSES_VERSION = "5.7";
6869
extern (C)
6970
{
7071

71-
//TODO curses.h say chtype, mmask_t is a ulong, but that exhibits errors...
7272
/* types */
73-
alias uint chtype;
74-
alias uint mmask_t;
73+
alias c_ulong chtype;
74+
alias c_ulong mmask_t;
7575
alias chtype attr_t;
7676
alias int OPTIONS;
7777
alias void SCREEN;
@@ -814,7 +814,7 @@ int wattron(W:WINDOW, N:chtype)(W* win, N attrs)
814814
{ return wattr_on(win, cast(attr_t)attrs, null); }
815815
int wattroff(W:WINDOW, N:chtype)(W* win, N attrs)
816816
{ return wattr_off(win, attrs, null); }
817-
int wattrset(W:WINDOW, N:chtype)(W* win, N attrs)
817+
N wattrset(W:WINDOW, N:chtype)(W* win, N attrs)
818818
{ return win.attrs = attrs; }
819819
int wattr_get(W:WINDOW, A:attr_t, S:short, V:void)
820820
(W* win, A* attrs, S* pair, V* opts)

deimos/ncurses/ncurses.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
/****************************************************************************
3030
* Author: Jude "1100110" Young <[email protected]. *
3131
****************************************************************************/
32-
module deimos.ncurses.curses;
32+
module deimos.ncurses.ncurses;
3333

3434
public import deimos.ncurses.curses;

0 commit comments

Comments
 (0)