From 2ca65f716aee9ec441dda91d91b88dd7a00bffa1 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 13 Nov 2001 22:06:58 +0000 Subject: [PATCH] Remove md5.c check, add CVS log stamp. Update comments. --- src/backend/libpq/Makefile | 9 ++------- src/backend/libpq/md5.c | 18 +++++++++++++++--- src/interfaces/odbc/md5.c | 18 +++++++++++++++--- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile index 45ec3e9d55..f45feaed1f 100644 --- a/src/backend/libpq/Makefile +++ b/src/backend/libpq/Makefile @@ -4,7 +4,7 @@ # Makefile for libpq subsystem (backend half of libpq interface) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.27 2001/11/12 04:19:15 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.28 2001/11/13 22:06:58 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,12 +19,7 @@ OBJS = be-fsstubs.o \ pqcomm.o pqformat.o pqsignal.o util.o -all: check_md5 SUBSYS.o - -check_md5: - @cmp -s md5.c ../../interfaces/odbc/md5.c || \ - (echo "src/interfaces/odbc/md5.c doesn't match src/backend/libpq/md5.c" && \ - exit 1) +all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) diff --git a/src/backend/libpq/md5.c b/src/backend/libpq/md5.c index 9c1f1e041d..8ad2ba1c6c 100644 --- a/src/backend/libpq/md5.c +++ b/src/backend/libpq/md5.c @@ -10,12 +10,24 @@ * * Sverre H. Huseby * - * There are two copies of this file, one in backend/libpq and another - * in interfaces/odbc. These two files must be identical or they will not - * compile. There is no CVS tag in this file so they can remain identical. + * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * $Log: md5.c,v $ + * Revision 1.13 2001/11/13 22:06:58 momjian + * Remove md5.c check, add CVS log stamp. Update comments. + * */ +/* + * NOTE: + * + * There are two copies of this file, one in backend/libpq and another + * in interfaces/odbc. They should be identical. + */ + #ifndef MD5_ODBC #include "postgres.h" #include "libpq/crypt.h" diff --git a/src/interfaces/odbc/md5.c b/src/interfaces/odbc/md5.c index 9c1f1e041d..ff3a14e172 100644 --- a/src/interfaces/odbc/md5.c +++ b/src/interfaces/odbc/md5.c @@ -10,12 +10,24 @@ * * Sverre H. Huseby * - * There are two copies of this file, one in backend/libpq and another - * in interfaces/odbc. These two files must be identical or they will not - * compile. There is no CVS tag in this file so they can remain identical. + * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * $Log: md5.c,v $ + * Revision 1.5 2001/11/13 22:06:58 momjian + * Remove md5.c check, add CVS log stamp. Update comments. + * */ +/* + * NOTE: + * + * There are two copies of this file, one in backend/libpq and another + * in interfaces/odbc. They should be identical. + */ + #ifndef MD5_ODBC #include "postgres.h" #include "libpq/crypt.h"