X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=form%2Ffty_alnum.c;h=e02105b1c104c36d1cd1098c8b004bd0b18fa425;hp=c5e05ff6dfcddb605b4bc4e0a0468305cd004064;hb=04d942c3d98cf0a929c6afb17be8c10d4ae39af0;hpb=f5da57ad7eb397b1001e2fca9cb0e278a6564716 diff --git a/form/fty_alnum.c b/form/fty_alnum.c index c5e05ff6..e02105b1 100644 --- a/form/fty_alnum.c +++ b/form/fty_alnum.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -34,7 +35,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fty_alnum.c,v 1.23 2009/11/07 20:17:58 tom Exp $") +MODULE_ID("$Id: fty_alnum.c,v 1.26 2020/05/24 01:40:20 anonymous.maarten Exp $") #define thisARG alnumARG @@ -63,7 +64,7 @@ Generic_This_Type(void *arg) if (argp) { - T((T_CREATE("thisARG %p"), argp)); + T((T_CREATE("thisARG %p"), (void *)argp)); argp->width = *((int *)arg); } } @@ -102,7 +103,7 @@ Copy_This_Type(const void *argp) if (result) { - T((T_CREATE("thisARG %p"), result)); + T((T_CREATE("thisARG %p"), (void *)result)); *result = *ap; } @@ -185,14 +186,14 @@ static FIELDTYPE typeTHIS = #endif }; -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_ALNUM = &typeTHIS; +FORM_EXPORT_VAR(FIELDTYPE*) TYPE_ALNUM = &typeTHIS; #if NCURSES_INTEROP_FUNCS /* The next routines are to simplify the use of ncurses from programming languages with restictions on interop with C level constructs (e.g. variable access or va_list + ellipsis constructs) */ -NCURSES_EXPORT(FIELDTYPE *) +FORM_EXPORT(FIELDTYPE *) _nc_TYPE_ALNUM(void) { return TYPE_ALNUM;