/****************************************************************************
- * Copyright (c) 1998-2011,2013 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2013,2014 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 *
/*
Version Control
- $Id: gen.c,v 1.61 2013/08/24 23:30:46 tom Exp $
+ $Id: gen.c,v 1.62 2014/01/26 00:21:52 Nicolas.Boulenguez Exp $
--------------------------------------------------------------------------*/
/*
This program generates various record structures and constants from the
* record type defined in the binding.
* We are only dealing with record types which are of 32 or 16
* bit size, i.e. they fit into an (u)int or a (u)short.
+ * Any pair with a 0 attr field will be ignored.
*/
static void
gen_reps(
assert(nap != NULL);
for (i = 0; nap[i].name != (char *)0; i++)
- {
- l = (int)strlen(nap[i].name);
- if (l > width)
- width = l;
- }
+ if (nap[i].attr)
+ {
+ l = (int)strlen(nap[i].name);
+ if (l > width)
+ width = l;
+ }
assert(width > 0);
printf(" type %s is\n", name);
printf(" record\n");
for (i = 0; nap[i].name != (char *)0; i++)
- {
- printf(" %-*s : Boolean;\n", width, nap[i].name);
- }
+ if (nap[i].attr)
+ {
+ printf(" %-*s : Boolean;\n", width, nap[i].name);
+ }
printf(" end record;\n");
printf(" pragma Convention (C, %s);\n\n", name);
printf(" record\n");
for (i = 0; nap[i].name != (char *)0; i++)
- {
- a = nap[i].attr;
- l = find_pos((char *)&a, sizeof(a), &low, &high);
- if (l >= 0)
- printf(" %-*s at 0 range %2d .. %2d;\n", width, nap[i].name,
- low - bias, high - bias);
- }
+ if (nap[i].attr)
+ {
+ a = nap[i].attr;
+ l = find_pos((char *)&a, sizeof(a), &low, &high);
+ if (l >= 0)
+ printf(" %-*s at 0 range %2d .. %2d;\n", width, nap[i].name,
+ low - bias, high - bias);
+ }
printf(" end record;\n");
printf(" pragma Warnings (Off);");
printf(" for %s'Size use %d;\n", name, len_bits);
* 1999-2000), the ifdef's also were needed since the proposed bit-layout
* for wide characters allocated 16-bits for A_CHARTEXT, leaving too few
* bits for a few of the A_xxx symbols.
+ * Some preprocessors are not able to test the values because they
+ * now (2014) contain an explicit cast to chtype, so we avoid ifdef.
*/
static const name_attribute_pair nap[] =
{
-#ifdef A_STANDOUT
{"Stand_Out", A_STANDOUT},
-#endif
-#ifdef A_UNDERLINE
{"Under_Line", A_UNDERLINE},
-#endif
-#ifdef A_REVERSE
{"Reverse_Video", A_REVERSE},
-#endif
-#ifdef A_BLINK
{"Blink", A_BLINK},
-#endif
-#ifdef A_DIM
{"Dim_Character", A_DIM},
-#endif
-#ifdef A_BOLD
{"Bold_Character", A_BOLD},
-#endif
-#ifdef A_ALTCHARSET
{"Alternate_Character_Set", A_ALTCHARSET},
-#endif
-#ifdef A_INVIS
{"Invisible_Character", A_INVIS},
-#endif
-#ifdef A_PROTECT
{"Protected_Character", A_PROTECT},
-#endif
-#ifdef A_HORIZONTAL
{"Horizontal", A_HORIZONTAL},
-#endif
-#ifdef A_LEFT
{"Left", A_LEFT},
-#endif
-#ifdef A_LOW
{"Low", A_LOW},
-#endif
-#ifdef A_RIGHT
{"Right", A_RIGHT},
-#endif
-#ifdef A_TOP
{"Top", A_TOP},
-#endif
-#ifdef A_VERTICAL
{"Vertical", A_VERTICAL},
-#endif
{(char *)0, 0}
};
chtype attr = A_ATTRIBUTES & ~A_COLOR;
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2155 2014/01/18 23:59:51 tom Exp $
+-- $Id: NEWS,v 1.2157 2014/01/26 00:20:39 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20140125
+ + remove unnecessary ifdef's in Ada95/gen/gen.c, which reportedly do
+ not work as is with gcc 4.8 due to fixes using chtype cast made for
+ new compiler warnings by gcc 4.8 in 20130824 (Debian #735753, patch
+ by Nicolas Boulenguez).
+
20140118
+ apply includesubdir variable which was introduced in 20130805 to
gen-pkgconfig.in (Debian #735782).
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.967 2014/01/19 00:00:07 tom Exp $
+# $Id: dist.mk,v 1.968 2014/01/25 16:16:43 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 9
-NCURSES_PATCH = 20140118
+NCURSES_PATCH = 20140125
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
projects / ncurses.git / commitdiff