Commit 52df5f5b authored by unknown's avatar unknown
Browse files

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged
parents d2baf0f1 8bf38858

acinclude.m4

+35 −0
Original line number Diff line number Diff line
@@ -665,6 +665,41 @@ AC_DEFINE(STRUCT_DIRENT_HAS_D_INO, [1], 
fi

])



AC_DEFUN(MYSQL_STRUCT_DIRENT_D_NAMLEN,

[AC_REQUIRE([AC_HEADER_DIRENT])

AC_MSG_CHECKING(if struct dirent has a d_namlen member)

AC_CACHE_VAL(mysql_cv_dirent_has_dnamlen,

[AC_TRY_COMPILE([

#include <stdio.h>

#include <sys/types.h>

#ifdef HAVE_UNISTD_H

# include <unistd.h>

#endif /* HAVE_UNISTD_H */

#if defined(HAVE_DIRENT_H)

# include <dirent.h>

#else

# define dirent direct

# ifdef HAVE_SYS_NDIR_H

#  include <sys/ndir.h>

# endif /* SYSNDIR */

# ifdef HAVE_SYS_DIR_H

#  include <sys/dir.h>

# endif /* SYSDIR */

# ifdef HAVE_NDIR_H

#  include <ndir.h>

# endif

#endif /* HAVE_DIRENT_H */

],[

struct dirent d; int z; z = (int)d.d_namlen;

], mysql_cv_dirent_has_dnamlen=yes, mysql_cv_dirent_has_dnamlen=no)])

AC_MSG_RESULT($mysql_cv_dirent_has_dnamlen)

if test "$mysql_cv_dirent_has_dnamlen" = "yes"; then

AC_DEFINE(STRUCT_DIRENT_HAS_D_NAMLEN, [1],

          [d_namlen member present in struct dirent])

fi

])





AC_DEFUN(MYSQL_TYPE_SIGHANDLER,

[AC_MSG_CHECKING([whether signal handlers are of type void])

AC_CACHE_VAL(mysql_cv_void_sighandler,

cmd-line-utils/libedit/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c 


CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c



DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR '-D__RCSID(x)=' '-D__COPYRIGHT(x)=' '-D__RENAME(x)=' '-D_DIAGASSERT(x)='

DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR 



SUFFIXES = .sh

cmd-line-utils/libedit/chared.c

+2 −2
Original line number Diff line number Diff line
@@ -62,13 +62,13 @@ cv_undo(EditLine *el) 
{

	c_undo_t *vu = &el->el_chared.c_undo;

	c_redo_t *r = &el->el_chared.c_redo;

	uint size;

	int size;



	/* Save entire line for undo */

	size = el->el_line.lastchar - el->el_line.buffer;

	vu->len = size;

	vu->cursor = el->el_line.cursor - el->el_line.buffer;

	memcpy(vu->buf, el->el_line.buffer, size);

	memcpy(vu->buf, el->el_line.buffer, (size_t)size);



	/* save command info for redo */

	r->count = el->el_state.doingarg ? el->el_state.argument : 0;

cmd-line-utils/libedit/config.h

+11 −0
Original line number Diff line number Diff line 


#include "my_config.h"

#include "sys.h"



#define __RCSID(x)

#define __COPYRIGHT(x)

#define __RENAME(x)

#define _DIAGASSERT(x)



#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)

#define __attribute__(A)

#endif

cmd-line-utils/libedit/np/unvis.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
 * SUCH DAMAGE.

 */



#include "config.h"

#if defined(LIBC_SCCS) && !defined(lint)

#if 0

static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";