Commit bd2a8078 authored by Bruce Momjian's avatar Bruce Momjian

> src/backend/commands/user.c file has some parse error at repalloc(),

palloc()$

Fixed.  Thanks.

> src/backend/postmaster/pgstat.c miss
> #include "tcop/tcopprot.h" line.

Fixed.

> src/utils/dllinit.c wrong include header line at MinGW.
> #include <cygwin/version.h> must be not included

Fixed.

> by the way,
> I can't compile eccp because I used lower version bison.

> and bin/pg_resetxlog too. in this case I can't find what's wrong.

Fixed.
parent 9e218af7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.135 2004/02/02 16:37:46 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.136 2004/02/02 17:21:07 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -470,7 +470,7 @@ AtEOXact_UpdatePasswordFile(bool isCommit) ...@@ -470,7 +470,7 @@ AtEOXact_UpdatePasswordFile(bool isCommit)
/* Rename active file while not holding an exclusive lock */ /* Rename active file while not holding an exclusive lock */
char *filename = user_getfilename(), *filename_new; char *filename = user_getfilename(), *filename_new;
filename_new = palloc(strlen(filename) + 1 + strlen(".new"))); filename_new = palloc(strlen(filename) + 1 + strlen(".new"));
sprintf(filename_new, "%s.new", filename); sprintf(filename_new, "%s.new", filename);
rename(filename_new, filename); rename(filename_new, filename);
pfree(filename); pfree(filename);
...@@ -489,7 +489,7 @@ AtEOXact_UpdatePasswordFile(bool isCommit) ...@@ -489,7 +489,7 @@ AtEOXact_UpdatePasswordFile(bool isCommit)
/* Rename active file while not holding an exclusive lock */ /* Rename active file while not holding an exclusive lock */
char *filename = group_getfilename(), *filename_new; char *filename = group_getfilename(), *filename_new;
filename_new = palloc(strlen(filename) + 1 + strlen(".new"))); filename_new = palloc(strlen(filename) + 1 + strlen(".new"));
sprintf(filename_new, "%s.new", filename); sprintf(filename_new, "%s.new", filename);
rename(filename_new, filename); rename(filename_new, filename);
pfree(filename); pfree(filename);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1998-2002, PostgreSQL Global Development Group # Copyright (c) 1998-2002, PostgreSQL Global Development Group
# #
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.3 2003/11/29 19:52:06 pgsql Exp $ # $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.4 2004/02/02 17:21:08 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,13 +12,19 @@ subdir = src/bin/pg_resetxlog ...@@ -12,13 +12,19 @@ subdir = src/bin/pg_resetxlog
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
OBJS= pg_resetxlog.o pg_crc.o override CPPFLAGS := $(CPPFLAGS) -DFRONTEND
OBJS= pg_resetxlog.o pg_crc.o \
$(filter dirmod.o, $(LIBOBJS))
all: submake-libpgport pg_resetxlog all: submake-libpgport pg_resetxlog
pg_resetxlog: $(OBJS) pg_resetxlog: $(OBJS)
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@ $(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
dirmod.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< .
pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
...@@ -32,4 +38,4 @@ uninstall: ...@@ -32,4 +38,4 @@ uninstall:
rm -f $(DESTDIR)$(bindir)/pg_resetxlog$(X) rm -f $(DESTDIR)$(bindir)/pg_resetxlog$(X)
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f pg_resetxlog$(X) pg_resetxlog.o pg_crc.o pg_crc.c rm -f pg_resetxlog$(X) pg_resetxlog.o pg_crc.o pg_crc.c dirmod.c
#ifdef CYGWIN
#include <cygwin/version.h> #include <cygwin/version.h>
#endif
#if CYGWIN_VERSION_DLL_MAJOR < 1001 #if CYGWIN_VERSION_DLL_MAJOR < 1001
/* dllinit.c -- Portable DLL initialization. /* dllinit.c -- Portable DLL initialization.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment