Skip site navigation (1) Skip section navigation (2)

PATCH: postgresql-7.1 + readline-4.2 compatability

From: "Adam J(dot) Richter" <adam(at)yggdrasil(dot)com>
To: pgsql-patches(at)postgresql(dot)org
Subject: PATCH: postgresql-7.1 + readline-4.2 compatability
Date: 2001-04-16 08:20:27
Message-ID: 200104160820.BAA09863@adam.yggdrasil.com (view raw or flat)
Thread:
Lists: pgsql-patches
	The following patch allows postgresql-7.1 to build under
readline-4.2, per the discussion on this topic on pgsql-hackers.
This patch should also preserve backware compatability.  It makes
the source code use the readline-4.2 terminology, with #define's
for automatic backward compatability.

	At this point all I know is that this patch allows postgresql-7.1
to compile successfully with readline-4.2.

Adam J. Richter     __     ______________   4880 Stevens Creek Blvd, Suite 104
adam(at)yggdrasil(dot)com     \ /                  San Jose, California 95129-1034
+1 408 261-6630         | g g d r a s i l   United States of America
fax +1 408 261-6631      "Free Software For The Rest Of Us."

--- postgresql-7.1/configure.in	Fri Apr 13 14:22:46 2001
+++ postgresql/configure.in	Mon Apr 16 00:51:02 2001
@@ -903,10 +903,15 @@
 else
     _readline_header='xxx'
 fi
-AC_EGREP_HEADER([filename_completion_function], [$_readline_header],
-[AC_DEFINE(HAVE_FILENAME_COMPLETION_FUNCTION_DECL)
-AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)])
+
+AC_EGREP_HEADER([rl_filename_completion_function], [$_readline_header],
+    [AC_DEFINE(HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL)
+     AC_MSG_RESULT(yes)],
+    [AC_MSG_RESULT(no)
+     AC_EGREP_HEADER([filename_completion_function], [$_readline_header],
+	[AC_DEFINE(HAVE_FILENAME_COMPLETION_FUNCTION_DECL)
+	 AC_MSG_RESULT(yes)],
+	[AC_MSG_RESULT(no)])])
 
 
 
--- postgresql-7.1/src/include/config.h.in	Fri Mar 23 16:54:58 2001
+++ postgresql/src/include/config.h.in	Mon Apr 16 00:52:00 2001
@@ -573,6 +573,9 @@
 /* Set to 1 if your libreadline defines rl_completion_append_character */
 #undef HAVE_RL_COMPLETION_APPEND_CHARACTER
 
+/* Set to 1 if rl_filename_completion_function is declared in the readline header */
+#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL
+
 /* Set to 1 if filename_completion_function is declared in the readline header */
 #undef HAVE_FILENAME_COMPLETION_FUNCTION_DECL
 
--- postgresql-7.1/src/bin/psql/tab-complete.c	Sun Apr  1 12:17:32 2001
+++ postgresql/src/bin/psql/tab-complete.c	Mon Apr 16 00:57:08 2001
@@ -60,9 +60,11 @@
 #include "common.h"
 #include "settings.h"
 
-#ifndef HAVE_FILENAME_COMPLETION_FUNCTION_DECL
-char	   *filename_completion_function(char *, int);
-
+#ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL
+#  define rl_filename_completion_function filename_completion_function
+#  ifndef HAVE_FILENAME_COMPLETION_FUNCTION_DECL
+     char	   *filename_completion_function(char *, int);
+#  endif
 #endif
 
 #define BUF_SIZE 2048
@@ -731,7 +733,7 @@
 			 strcmp(prev_wd, "\\s") == 0 ||
 		   strcmp(prev_wd, "\\w") == 0 || strcmp(prev_wd, "\\write") == 0
 		)
-		matches = completion_matches(text, filename_completion_function);
+		matches = completion_matches(text, rl_filename_completion_function);
 
 
 	/*


Responses

pgsql-patches by date

Next:From: Bruce MomjianDate: 2001-04-16 14:37:14
Subject: Re: Patch for catching incompatible types in fk constraints
Previous:From: Stephan SzaboDate: 2001-04-16 07:19:44
Subject: Re: Patch for catching incompatible types in fk constraints

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group