ncurses 6.0 - patch 20161126

[ncurses.git] / ncurses / tinfo / lib_longname.c

diff --git a/ncurses/tinfo/lib_longname.c b/ncurses/tinfo/lib_longname.c
index 2164a126ca8b95a3395db56f2e2e6cfb81595205..fa231b88def85ddeb187a5ccfe837e1031fb32d4 100644 (file)
--- a/ncurses/tinfo/lib_longname.c
+++ b/ncurses/tinfo/lib_longname.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2015 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            *


@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_longname.c,v 1.11 2009/02/21 17:18:02 tom Exp $")
+MODULE_ID("$Id: lib_longname.c,v 1.13 2015/07/25 20:08:14 tom Exp $")

 
 #if USE_REENTRANT
 NCURSES_EXPORT(char *)
 
 #if USE_REENTRANT
 NCURSES_EXPORT(char *)


@@ -52,7 +52,7 @@ NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0)
     {'\0'};
     char *ptr;
 
     {'\0'};
     char *ptr;
 

-    T((T_CALLED("longname(%p)"), SP_PARM));
+    T((T_CALLED("longname(%p)"), (void *) SP_PARM));

 
     if (SP_PARM) {
        for (ptr = SP_PARM->_ttytype + strlen(SP_PARM->_ttytype);
 
     if (SP_PARM) {
        for (ptr = SP_PARM->_ttytype + strlen(SP_PARM->_ttytype);


@@ -74,6 +74,17 @@ longname(void)
 #endif
 
 #else
 #endif
 
 #else

+
+/* a dummy entrypoint is simpler than generating a conditional in curses.h */
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char *)
+NCURSES_SP_NAME(longname) (NCURSES_SP_DCL0)
+{
+    (void) SP_PARM;
+    return longname();
+}
+#endif
+

 NCURSES_EXPORT(char *)
 longname(void)
 {
 NCURSES_EXPORT(char *)
 longname(void)
 {