*
* Copyright (c) 2001-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.64 2004/03/27 17:59:35 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.65 2004/04/05 03:16:21 momjian Exp $
* ----------
*/
#include "postgres.h"
static void pgstat_recv_dropdb(PgStat_MsgDropdb *msg, int len);
static void pgstat_recv_resetcounter(PgStat_MsgResetcounter *msg, int len);
-/*
- * WIN32 doesn't allow descriptors returned by pipe() to be used in select(),
- * so for that platform we use socket() instead of pipe().
- */
-#ifndef WIN32
-#define pgpipe(a) pipe(a)
-#define piperead(a,b,c) read(a,b,c)
-#define pipewrite(a,b,c) write(a,b,c)
-#else
-extern int pgpipe(int handles[2]); /* pgpipe() is in /src/port */
-#define piperead(a,b,c) recv(a,b,c,0)
-#define pipewrite(a,b,c) send(a,b,c,0)
-#endif
/* ------------------------------------------------------------
* Public functions called from postmaster follow
-@erase "$(INTDIR)\large_obj.obj"
-@erase "$(INTDIR)\print.obj"
-@erase "$(INTDIR)\describe.obj"
+ -@erase "$(INTDIR)\psqlscan.obj"
-@erase "$(INTDIR)\tab-complete.obj"
-@erase "$(INTDIR)\sprompt.obj"
-@erase "$(INTDIR)\getopt.obj"
"$(INTDIR)\large_obj.obj" \
"$(INTDIR)\print.obj" \
"$(INTDIR)\describe.obj" \
+ "$(INTDIR)\psqlscan.obj" \
"$(INTDIR)\tab-complete.obj" \
"$(INTDIR)\sprompt.obj" \
"$(INTDIR)\getopt.obj" \
sql_help.h: create_help.pl
$(PERL) create_help.pl $(REFDOCDIR) $@
-
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.43 2004/03/19 02:23:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.44 2004/04/05 03:16:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef LIBPQ_BE_H
#define LIBPQ_BE_H
+#ifndef _MSC_VER
#include <sys/time.h>
+#endif
#ifdef USE_SSL
#include <openssl/ssl.h>
#include <openssl/err.h>
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/port.h,v 1.23 2004/03/24 03:54:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.24 2004/04/05 03:16:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
extern off_t ftello(FILE *stream);
#endif
-#if defined(WIN32) || defined(__CYGWIN__)
+/*
+ * WIN32 doesn't allow descriptors returned by pipe() to be used in select(),
+ * so for that platform we use socket() instead of pipe().
+ */
+#ifndef WIN32
+#define pgpipe(a) pipe(a)
+#define piperead(a,b,c) read(a,b,c)
+#define pipewrite(a,b,c) write(a,b,c)
+#else
+extern int pgpipe(int handles[2]);
+#define piperead(a,b,c) recv(a,b,c,0)
+#define pipewrite(a,b,c) send(a,b,c,0)
+#endif
+
+#if defined(__MINGW32__) || defined(__CYGWIN__)
/*
* Win32 doesn't have reliable rename/unlink during concurrent access
*/
extern int pgrename(const char *from, const char *to);
extern int pgunlink(const char *path);
-
#define rename(from, to) pgrename(from, to)
#define unlink(path) pgunlink(path)
#endif
#ifdef WIN32
/* open() replacement to allow delete of held files */
+#ifndef _MSC_VER
extern int win32_open(const char*,int,...);
#define open(a,b,...) win32_open(a,b,##__VA_ARGS__)
+#endif
extern int copydir(char *fromdir, char *todir);
PQfformat @ 109
PQexecPrepared @ 110
PQsendQueryPrepared @ 111
+ PQdsplen @ 112
-@erase "$(INTDIR)\thread.obj"
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
+ -@erase "$(INTDIR)\noblock.obj"
-@erase "$(INTDIR)\path.obj"
-@erase "$(INTDIR)\dllist.obj"
-@erase "$(INTDIR)\md5.obj"
"$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \
+ "$(INTDIR)\noblock.obj" \
"$(INTDIR)\path.obj" \
"$(INTDIR)\dllist.obj" \
"$(INTDIR)\md5.obj" \
$(CPP_PROJ) ..\..\port\crypt.c
<<
+"$(INTDIR)\noblock.obj" : ..\..\port\noblock.c
+ $(CPP) @<<
+ $(CPP_PROJ) ..\..\port\noblock.c
+<<
+
"$(INTDIR)\path.obj" : ..\..\port\path.c
$(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c