X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fgen%2Fgen.c;h=d8ea44f74d5bd81b4841e516708be40c30c149dc;hp=97aea3a36425183ef7bc2b0d3957f66ac43c61fb;hb=f6718d80c998008de6cfe8e6296bee3958ff86d7;hpb=5a9c046f10f72b47ad32801a8e54fe3d05aa8051

diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c
index 97aea3a3..d8ea44f7 100644
--- 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            *
@@ -32,7 +32,7 @@
 
 /*
     Version Control
-    $Id: gen.c,v 1.46 2007/03/31 23:39:15 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
@@ -775,8 +775,9 @@ gen_acs(void)
 {
   printf("   type C_ACS_Map is array (Character'Val (0) .. Character'Val (127))\n");
   printf("        of Attributed_Character;\n");
-#if USE_REENTRANT
-  printf("   function ACS_Map return C_ACS_Map;\n");
+#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");
 #else
   printf("   ACS_Map : C_ACS_Map;\n");
@@ -1146,15 +1147,13 @@ color_def(const char *name, int 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)
 {
-#ifdef HAVE_USE_DEFAULT_COLORS
+#if HAVE_USE_DEFAULT_COLORS
   color_def("Default_Color", -1);
 #endif
 #ifdef COLOR_BLACK