Обсуждение: 2 small patches that fix 8.3.5 compile issues on Vista+MingW+Msys

A couple of months ago I noted that 8.3.4 doesn't compile on Vista using
MingW+msys under certain conditions:

http://archives.postgresql.org/pgsql-hackers/2008-09/msg01496.php

8.3.5 has the same problem.

Attached are two one line patches that fix it.

Thanks,

Charlie

--- libpq-int.h    2008-11-05 23:22:36 -0700
+++ libpq-int - Copy.h    2008-11-05 23:22:30 -0700
@@ -54,7 +54,6 @@

 #ifdef ENABLE_SSPI
 #define SECURITY_WIN32
-#include <ntsecapi.h>
 #include <security.h>
 #undef SECURITY_WIN32

--- libpq-be.h    2008-11-05 23:22:49 -0700
+++ libpq-be - Copy.h    2008-11-05 23:22:40 -0700
@@ -47,7 +47,7 @@

 #ifdef ENABLE_SSPI
 #define SECURITY_WIN32
-#include <ntsecapi.h>
+#include <security.h>
 #undef SECURITY_WIN32

 #ifndef ENABLE_GSS

Charlie Savage wrote:
> A couple of months ago I noted that 8.3.4 doesn't compile on Vista using
> MingW+msys under certain conditions:
>
> http://archives.postgresql.org/pgsql-hackers/2008-09/msg01496.php
>
> 8.3.5 has the same problem.
>
> Attached are two one line patches that fix it.

Sorry, I attached incorrect patches in the original email.  Here are the
correct ones.

Thanks,

Charlie
--
Charlie Savage
http://cfis.savagexi.com
*** libpq-be.h.old    Wed Nov  5 23:32:50 2008
--- libpq-be.h    Wed Nov  5 23:35:52 2008
***************
*** 47,52 ****
--- 47,53 ----

  #ifdef ENABLE_SSPI
  #define SECURITY_WIN32
+ #include <ntsecapi.h>
  #include <security.h>
  #undef SECURITY_WIN32

*** libpq-int.h.old    Wed Nov  5 23:37:48 2008
--- libpq-int.h    Wed Nov  5 23:38:14 2008
***************
*** 54,59 ****
--- 54,60 ----

  #ifdef ENABLE_SSPI
  #define SECURITY_WIN32
+ #include <ntsecapi.h>
  #include <security.h>
  #undef SECURITY_WIN32

Uh, do we still need this patch?

---------------------------------------------------------------------------

Charlie Savage wrote:
> Charlie Savage wrote:
> > A couple of months ago I noted that 8.3.4 doesn't compile on Vista using 
> > MingW+msys under certain conditions:
> > 
> > http://archives.postgresql.org/pgsql-hackers/2008-09/msg01496.php
> > 
> > 8.3.5 has the same problem.
> > 
> > Attached are two one line patches that fix it.
> 
> Sorry, I attached incorrect patches in the original email.  Here are the 
> correct ones.
> 
> Thanks,
> 
> Charlie
> -- 
> Charlie Savage
> http://cfis.savagexi.com

> *** libpq-be.h.old    Wed Nov  5 23:32:50 2008
> --- libpq-be.h    Wed Nov  5 23:35:52 2008
> ***************
> *** 47,52 ****
> --- 47,53 ----
>   
>   #ifdef ENABLE_SSPI
>   #define SECURITY_WIN32
> + #include <ntsecapi.h>
>   #include <security.h>
>   #undef SECURITY_WIN32
>   
> 
> *** libpq-int.h.old    Wed Nov  5 23:37:48 2008
> --- libpq-int.h    Wed Nov  5 23:38:14 2008
> ***************
> *** 54,59 ****
> --- 54,60 ----
>   
>   #ifdef ENABLE_SSPI
>   #define SECURITY_WIN32
> + #include <ntsecapi.h>
>   #include <security.h>
>   #undef SECURITY_WIN32
>   
> 
> 
> -- 
> Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgsql-hackers

--  Bruce Momjian  <bruce@momjian.us>        http://momjian.us EnterpriseDB
http://enterprisedb.com
 + If your life is a hard drive, Christ can be your backup. +

Hi Bruce,

> Uh, do we still need this patch?

I'd say yes for 8.3.x (my guess is that I see this because I have 
additional libraries installed on my mingw version versus what other 
developers have - perhaps openssl-0.9.8i).

Not sure on 8.4, but can test if you'd like.

Charlie

Charlie Savage wrote:
> Hi Bruce,
> 
>> Uh, do we still need this patch?
> 
> I'd say yes for 8.3.x (my guess is that I see this because I have
> additional libraries installed on my mingw version versus what other
> developers have - perhaps openssl-0.9.8i).
> 
> Not sure on 8.4, but can test if you'd like.

Please do.

IIRC I was unable to reproduce it the last time, but that could very
well be environment-specific.

//Magnus