form_wrap.h in ncursesw-1.2.4.3 vs form_wrap.h in ncursesw-1.4.0.0

- old
+ new

@@ -1,11 +1,11 @@ /* * This is a curses forms wrapper as part of ncurses-ruby * Contributed by Simon Kaczor <skaczor@cox.net> * Prognosoft Inc. <http://www.prognosoft.biz> * Copyright 2004 - * + * * This module is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * @@ -16,25 +16,33 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this module; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Changes + * (C) 2011 Tobias Herzke + * (C) 2013 Gaute Hope <eg@gaute.vetsj.com> */ -#if !defined(FORM_HH) && defined(HAVE_FORM_H) +#if !defined(FORM_HH) && (defined(HAVE_FORM_H) || defined(HAVE_NCURSESW_FORM_H)) #define FORM_HH +#ifdef HAVE_FORM_H #include <form.h> +#else +#include <ncursesw/form.h> +#endif + #include <ruby.h> extern VALUE mForm; extern VALUE cFIELD; extern VALUE cFIELDTYPE; extern VALUE cFORM; /*extern VALUE cPAGE;*/ typedef struct { - bool (* field_check)(FIELD *,const void *); + bool (* field_check)(FIELD *,const void *); FIELDTYPE* fieldtype; } FLDCHKFUNC;