pg 0.11.0 → 0.12.0pre258

data/ext/extconf.rb

@@ -2,6 +2,11 @@ require 'pp'
 require 'mkmf'
 
 
+if ENV['MAINTAINER_MODE']
+	$stderr.puts "Maintainer mode enabled."
+	$CFLAGS << ' -Wall' << ' -ggdb' << ' -DDEBUG'
+end
+
 if pgdir = with_config( 'pg' )
 	ENV['PATH'] = "#{pgdir}/bin" + File::PATH_SEPARATOR + ENV['PATH']
 end
@@ -21,8 +26,8 @@ dir_config 'pg'
 
 if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_executable('pg_config') )
 	$stderr.puts "Using config values from %s" % [ pgconfig ]
-	$CPPFLAGS << " -I%s" % [ `#{pgconfig} --includedir`.chomp ]
-	$LDFLAGS << " -L%s" % [ `#{pgconfig} --libdir`.chomp ]
+	$CPPFLAGS << " -I%s" % [ `"#{pgconfig}" --includedir`.chomp ]
+	$LDFLAGS << " -L%s" % [ `"#{pgconfig}" --libdir`.chomp ]
 else
 	$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
 		" --with-pg-config=/path/to/pg_config"

data/ext/pg.c

@@ -9,7 +9,7 @@
   modified at: Wed Jan 20 16:41:51 1999
 
   $Author: ged $
-  $Date: 2011/04/18 23:51:05 $
+  $Date: 2011/10/07 20:24:14 $
 ************************************************/
 
 #include "pg.h"
@@ -28,7 +28,7 @@ static VALUE rb_cPGconn;
 static VALUE rb_cPGresult;
 static VALUE rb_ePGError;
 
-static const char *VERSION = "0.11.0";
+static const char *VERSION = "0.12.0";
 
 
 /* The following functions are part of libpq, but not
@@ -293,7 +293,7 @@ pgconn_alloc(VALUE klass)
  * If the Ruby default internal encoding is set (i.e., Encoding.default_internal != nil), the
  * connection will have its +client_encoding+ set accordingly.
  * 
- * @raises [PGError] if the connection fails.
+ * Raises a PGError if the connection fails.
  */
 static VALUE
 pgconn_init(int argc, VALUE *argv, VALUE self)
@@ -784,7 +784,7 @@ pgconn_server_version(VALUE self)
 
 /*
  * call-seq:
- *    conn.error() -> String
+ *    conn.error_message -> String
  *
  * Returns the error message about connection.
  */
@@ -1285,7 +1285,6 @@ pgconn_make_empty_pgresult(VALUE self, VALUE status)
 /*
  * call-seq:
  *    conn.escape_string( str ) -> String
- *    PGconn.escape_string( str ) -> String  # DEPRECATED
  *
  * Connection instance method for versions of 8.1 and higher of libpq
  * uses PQescapeStringConn, which is safer. Avoid calling as a class method,
@@ -1343,7 +1342,6 @@ pgconn_s_escape(VALUE self, VALUE string)
 /*
  * call-seq:
  *   conn.escape_bytea( string ) -> String 
- *   PGconn.escape_bytea( string ) -> String # DEPRECATED
  *
  * Connection instance method for versions of 8.1 and higher of libpq
  * uses PQescapeByteaConn, which is safer. Avoid calling as a class method,
@@ -2056,6 +2054,7 @@ void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
  * call-seq:
  *    conn.wait_for_notify( [ timeout ] ) -> String
  *    conn.wait_for_notify( [ timeout ] ) { |event, pid| block }
+ *    conn.wait_for_notify( [ timeout ] ) { |event, pid, payload| block } # PostgreSQL 9.0
  *
  * Blocks while waiting for notification(s), or until the optional
  * _timeout_ is reached, whichever comes first.  _timeout_ is
@@ -2065,6 +2064,10 @@ void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
  * event otherwise.  If used in block form, passes the name of the
  * NOTIFY +event+ and the generating +pid+ into the block.
  * 
+ * Under PostgreSQL 9.0 and later, if the notification is sent with
+ * the optional +payload+ string, it will be given to the block as the
+ * third argument.
+ * 
  */
 static VALUE
 pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
@@ -2075,7 +2078,7 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 	int ret;
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
-	VALUE timeout_in, relname = Qnil, be_pid = Qnil, extra = Qnil;
+	VALUE timeout_in = Qnil, relname = Qnil, be_pid = Qnil, extra = Qnil;
 	double timeout_sec;
 	fd_set sd_rset;
 #ifdef _WIN32
@@ -2085,7 +2088,9 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 	if ( sd < 0 )
 		rb_bug( "PQsocket(conn): couldn't fetch the connection's socket!" );
 
-	if ( rb_scan_args(argc, argv, "01", &timeout_in) == 1 ) {
+	rb_scan_args( argc, argv, "01", &timeout_in );
+
+	if ( RTEST(timeout_in) ) {
 		timeout_sec = NUM2DBL( timeout_in );
 		timeout.tv_sec = (long)timeout_sec;
 		timeout.tv_usec = (long)( (timeout_sec - (long)timeout_sec) * 1e6 );
@@ -2120,9 +2125,13 @@ pgconn_wait_for_notify(int argc, VALUE *argv, VALUE self)
 	}
 
 	relname = rb_tainted_str_new2( notification->relname );
+	ASSOCIATE_INDEX( relname, self );
 	be_pid = INT2NUM( notification->be_pid );
 #ifdef HAVE_ST_NOTIFY_EXTRA
-	extra = rb_str_new2( notification->extra );
+	if ( *notification->extra ) {
+		extra = rb_tainted_str_new2( notification->extra );
+		ASSOCIATE_INDEX( extra, self );
+	}
 #endif
 	PQfreemem( notification );
 
@@ -2483,6 +2492,7 @@ pgconn_transaction(VALUE self)
 	return Qnil;
 }
 
+
 /*
  * call-seq:
  *    PGconn.quote_ident( str ) -> String
@@ -2532,6 +2542,8 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
 }
 
 
+#ifndef _WIN32
+
 /*
  * call-seq:
  *    conn.block( [ timeout ] ) -> Boolean
@@ -2547,27 +2559,152 @@ pgconn_s_quote_ident(VALUE self, VALUE in_str)
  */
 static VALUE
 pgconn_block( int argc, VALUE *argv, VALUE self ) {
-	PGconn *conn = get_pgconn(self);
-	int sd = PQsocket(conn);
+	PGconn *conn = get_pgconn( self );
+	int sd = PQsocket( conn );
 	int ret;
+
+	/* If WIN32 and Ruby 1.9 do not use rb_thread_select() which sometimes hangs 
+	 * and does not wait (nor sleep) any time even if timeout is given.
+	 * Instead use the Winsock events and rb_w32_wait_events(). */
+
 	struct timeval timeout;
 	struct timeval *ptimeout = NULL;
+	fd_set sd_rset;
+	VALUE timeout_in;
+	double timeout_sec;
+
+	if ( rb_scan_args(argc, argv, "01", &timeout_in) == 1 ) {
+		timeout_sec = NUM2DBL( timeout_in );
+		timeout.tv_sec = (long)timeout_sec;
+		timeout.tv_usec = (long)((timeout_sec - (long)timeout_sec) * 1e6);
+		ptimeout = &timeout;
+	}
+
+	/* Check for connection errors (PQisBusy is true on connection errors) */
+	if ( PQconsumeInput(conn) == 0 )
+		rb_raise( rb_ePGError, PQerrorMessage(conn) );
+
+	while ( PQisBusy(conn) ) {
+		FD_ZERO( &sd_rset );
+		FD_SET( sd, &sd_rset );
+
+		if ( (ret = rb_thread_select( sd+1, &sd_rset, NULL, NULL, ptimeout )) < 0 )
+			rb_sys_fail( "rb_thread_select()" ); /* Raises */
+
+		/* Return false if there was a timeout argument and the select() timed out */
+		if ( ret == 0 && argc )
+			return Qfalse;
+
+		/* Check for connection errors (PQisBusy is true on connection errors) */
+		if ( PQconsumeInput(conn) == 0 )
+			rb_raise( rb_ePGError, PQerrorMessage(conn) );
+	}
+
+	return Qtrue;
+}
+
+
+#else /* _WIN32 */
+
+/*
+ * Win32 PGconn#block -- on Windows, use platform-specific strategies to wait for the socket 
+ * instead of rb_thread_select().
+ */
+
+/* Win32 + Ruby 1.9+ */
+#ifdef HAVE_RUBY_VM_H
+
+int rb_w32_wait_events( HANDLE *events, int num, DWORD timeout );
+
+/* If WIN32 and Ruby 1.9 do not use rb_thread_select() which sometimes hangs 
+ * and does not wait (nor sleep) any time even if timeout is given.
+ * Instead use the Winsock events and rb_w32_wait_events(). */
+
+static VALUE
+pgconn_block( int argc, VALUE *argv, VALUE self ) {
+	PGconn *conn = get_pgconn( self );
+	int sd = PQsocket( conn );
+	int ret;
+
+	DWORD timeout_milisec = INFINITY;
+	DWORD wait_ret;
+	WSAEVENT hEvent;
 	VALUE timeout_in;
 	double timeout_sec;
+
+	hEvent = WSACreateEvent();
+
+	if ( rb_scan_args(argc, argv, "01", &timeout_in) == 1 ) {
+		timeout_sec = NUM2DBL( timeout_in );
+		timeout_milisec = (DWORD)( (timeout_sec - (DWORD)timeout_sec) * 1e3 );
+	}
+
+	/* Check for connection errors (PQisBusy is true on connection errors) */
+	if( PQconsumeInput(conn) == 0 ) {
+		WSACloseEvent( hEvent );
+		rb_raise( rb_ePGError, PQerrorMessage(conn) );
+	}
+
+	while ( PQisBusy(conn) ) {
+		if ( WSAEventSelect(sd, hEvent, FD_READ|FD_CLOSE) == SOCKET_ERROR ) {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_ePGError, "WSAEventSelect socket error: %d", WSAGetLastError() );
+		}
+
+		wait_ret = rb_w32_wait_events( &hEvent, 1, 100 );
+
+		if ( wait_ret == WAIT_TIMEOUT ) {
+			ret = 0;
+		} else if ( wait_ret == WAIT_OBJECT_0 ) {
+			ret = 1;
+		} else if ( wait_ret == WAIT_FAILED ) {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_ePGError, "Wait on socket error (WaitForMultipleObjects): %d", GetLastError() );
+		} else {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_ePGError, "Wait on socket abandoned (WaitForMultipleObjects)" );
+		}
+
+		/* Return false if there was a timeout argument and the select() timed out */
+		if ( ret == 0 && argc ) {
+			WSACloseEvent( hEvent );
+			return Qfalse;
+		}
+
+		/* Check for connection errors (PQisBusy is true on connection errors) */
+		if ( PQconsumeInput(conn) == 0 ) {
+			WSACloseEvent( hEvent );
+			rb_raise( rb_ePGError, PQerrorMessage(conn) );
+		}
+	}
+
+	WSACloseEvent( hEvent );
+
+	return Qtrue;
+}
+
+#else /* Win32 + Ruby < 1.9 */
+
+static VALUE
+pgconn_block( int argc, VALUE *argv, VALUE self ) {
+	PGconn *conn = get_pgconn( self );
+	int sd = PQsocket( conn );
+	int ret;
+
+	struct timeval timeout;
+	struct timeval *ptimeout = NULL;
 	fd_set sd_rset;
-#ifdef _WIN32
 	fd_set crt_sd_rset;
-#endif
+	VALUE timeout_in;
+	double timeout_sec;
 
-	/* Always set a timeout in WIN32, as rb_thread_select() sometimes
+	/* Always set a timeout, as rb_thread_select() sometimes
 	 * doesn't return when a second ruby thread is running although data
 	 * could be read. So we use timeout-based polling instead.
 	 */
-#if defined(_WIN32)
 	timeout.tv_sec = 0;
-	timeout.tv_usec = 10000;
+	timeout.tv_usec = 10000; // 10ms
 	ptimeout = &timeout;
-#endif
 
 	if ( rb_scan_args(argc, argv, "01", &timeout_in) == 1 ) {
 		timeout_sec = NUM2DBL( timeout_in );
@@ -2576,32 +2713,33 @@ pgconn_block( int argc, VALUE *argv, VALUE self ) {
 		ptimeout = &timeout;
 	}
 
-	PQconsumeInput( conn );
+	/* Check for connection errors (PQisBusy is true on connection errors) */
+	if( PQconsumeInput(conn) == 0 )
+		rb_raise( rb_ePGError, PQerrorMessage(conn) );
 
 	while ( PQisBusy(conn) ) {
 		FD_ZERO( &sd_rset );
 		FD_SET( sd, &sd_rset );
 
-#ifdef _WIN32
-		create_crt_fd(&sd_rset, &crt_sd_rset);
-#endif
-
-		ret = rb_thread_select (sd+1, &sd_rset, NULL, NULL, ptimeout );
-
-#ifdef _WIN32
-		cleanup_crt_fd(&sd_rset, &crt_sd_rset);
-#endif
+		create_crt_fd( &sd_rset, &crt_sd_rset );
+		ret = rb_thread_select( sd+1, &sd_rset, NULL, NULL, ptimeout );
+		cleanup_crt_fd( &sd_rset, &crt_sd_rset );
 
 		/* Return false if there was a timeout argument and the select() timed out */
-		if ( ret == 0 && argc ) 
+		if ( ret == 0 && argc )
 			return Qfalse;
 
-		PQconsumeInput( conn );
-	} 
+		/* Check for connection errors (PQisBusy is true on connection errors) */
+		if ( PQconsumeInput(conn) == 0 )
+			rb_raise( rb_ePGError, PQerrorMessage(conn) );
+	}
 
 	return Qtrue;
 }
 
+#endif /* Ruby 1.9 */
+#endif /* Win32 */
+
 
 /*
  * call-seq:
@@ -2663,6 +2801,7 @@ pgconn_async_exec(int argc, VALUE *argv, VALUE self)
 	VALUE rb_pgresult = Qnil;
 
 	/* remove any remaining results from the queue */
+	pgconn_block( 0, NULL, self ); /* wait for input (without blocking) before reading the last result */
 	pgconn_get_last_result( self );
 
 	pgconn_send_query( argc, argv, self );
@@ -3068,10 +3207,10 @@ pgresult_result_error_message(VALUE self)
 static VALUE
 pgresult_result_error_field(VALUE self, VALUE field)
 {
-	PGresult *result = get_pgresult(self);
-	int fieldcode = NUM2INT(field);
-	VALUE ret = rb_tainted_str_new2(PQresultErrorField(result,fieldcode));
-	ASSOCIATE_INDEX(ret, self);
+	PGresult *result = get_pgresult( self );
+	int fieldcode = NUM2INT( field );
+ 	VALUE ret = rb_tainted_str_new2( PQresultErrorField(result, fieldcode) );
+	ASSOCIATE_INDEX( ret, self );
 	return ret;
 }
 
@@ -4004,7 +4143,6 @@ Init_pg_ext()
 	rb_define_singleton_method(rb_cPGconn, "quote_ident", pgconn_s_quote_ident, 1);
 	rb_define_singleton_method(rb_cPGconn, "connect_start", pgconn_s_connect_start, -1);
 	rb_define_singleton_method(rb_cPGconn, "conndefaults", pgconn_s_conndefaults, 0);
-	
 
 	/******     PGconn CLASS CONSTANTS: Connection Status     ******/
 

data/ext/vc/pg.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pg", "pg_18\pg.vcproj", "{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pg_19", "pg_19\pg_19.vcproj", "{2EE30C74-074F-4611-B39B-38D5F3C9B071}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Debug|Win32.Build.0 = Debug|Win32
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Release|Win32.ActiveCfg = Release|Win32
+		{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}.Release|Win32.Build.0 = Release|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Debug|Win32.Build.0 = Debug|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Release|Win32.ActiveCfg = Release|Win32
+		{2EE30C74-074F-4611-B39B-38D5F3C9B071}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

data/ext/vc/pg_18/pg.vcproj

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="pg"
+	ProjectGUID="{9A8BF0C8-1D75-4DC0-8D84-BAEFD693795E}"
+	RootNamespace="pg"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\Development\ruby\lib\ruby\1.8\i386-mswin32&quot;;C:\Development\msys\local\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PG_EXPORTS;HAVE_LIBPQ_FE_H;HAVE_LIBPQ_LIBPQ_FS_H;HAVE_PQCONNECTIONUSEDPASSWORD;HAVE_PQISTHREADSAFE;HAVE_LO_CREATE;HAVE_PQPREPARE;HAVE_PQEXECPARAMS;HAVE_PQESCAPESTRING;HAVE_PQESCAPESTRINGCONN;HAVE_PG_ENCODING_TO_CHAR;HAVE_PQSETCLIENTENCODING"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libpq.lib msvcrt-ruby18.lib"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\pg-0.7.9.2009.03.14-x86-mswin32-60\lib\$(ProjectName).so"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="C:\Development\msys\local\include;&quot;C:\Development\ruby\lib\ruby\1.8\i386-mswin32_90&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PG_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName).so"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\compat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\pg.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\compat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\pg.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>