ncurses 5.6 - patch 20081011

[ncurses.git] / Ada95 / gen / gen.c

diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c
index 86cfd0e11fb7fe781f11cc372752b9b8f3a7832f..d8ea44f74d5bd81b4841e516708be40c30c149dc 100644 (file)
--- a/Ada95/gen/gen.c
+++ b/Ada95/gen/gen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998,2007,2008 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -32,7 +32,7 @@
 
 /*
     Version Control
 
 /*
     Version Control

-    $Id: gen.c,v 1.47 2007/04/07 22:29:23 tom Exp $
+    $Id: gen.c,v 1.49 2008/10/04 21:59:37 tom Exp $

   --------------------------------------------------------------------------*/
 /*
   This program generates various record structures and constants from the
   --------------------------------------------------------------------------*/
 /*
   This program generates various record structures and constants from the


@@ -775,7 +775,7 @@ gen_acs(void)
 {
   printf("   type C_ACS_Map is array (Character'Val (0) .. Character'Val (127))\n");
   printf("        of Attributed_Character;\n");
 {
   printf("   type C_ACS_Map is array (Character'Val (0) .. Character'Val (127))\n");
   printf("        of Attributed_Character;\n");

-#if USE_REENTRANT
+#if USE_REENTRANT || BROKEN_LINKER

   printf("   type C_ACS_Ptr is access C_ACS_Map;\n");
   printf("   function ACS_Map return C_ACS_Ptr;\n");
   printf("   pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");
   printf("   type C_ACS_Ptr is access C_ACS_Map;\n");
   printf("   function ACS_Map return C_ACS_Ptr;\n");
   printf("   pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");


@@ -1147,15 +1147,13 @@ color_def(const char *name, int value)
   printf("   %-16s : constant Color_Number := %d;\n", name, value);
 }
 
   printf("   %-16s : constant Color_Number := %d;\n", name, value);
 }
 

-#define HAVE_USE_DEFAULT_COLORS 1
-

 /*
  * Generate all color definitions
  */
 static void
 gen_color(void)
 {
 /*
  * Generate all color definitions
  */
 static void
 gen_color(void)
 {

-#ifdef HAVE_USE_DEFAULT_COLORS
+#if HAVE_USE_DEFAULT_COLORS

   color_def("Default_Color", -1);
 #endif
 #ifdef COLOR_BLACK
   color_def("Default_Color", -1);
 #endif
 #ifdef COLOR_BLACK