--- Merging r22273 into '.':

U    packages/postgres/src/postgres3dyn.pp
--- Merging r22274 into '.':
U    packages/postgres/src/dllistdyn.pp

# revisions: 22273,22274
r22273 | michael | 2012-08-31 12:00:38 +0200 (Fri, 31 Aug 2012) | 1 line
Changed paths:
   M /trunk/packages/postgres/src/postgres3dyn.pp

* Set library name to pqlib for all windowses
r22274 | michael | 2012-08-31 12:04:58 +0200 (Fri, 31 Aug 2012) | 1 line
Changed paths:
   M /trunk/packages/postgres/src/dllistdyn.pp

* Removed pqlib and default value. It should always load the lib loaded by postgres3dyn

git-svn-id: branches/fixes_2_6@22672 -

packages/postgres/src/dllistdyn.pp

@@ -14,15 +14,6 @@ uses
 
 {$PACKRECORDS C}
 
-{$IFDEF Unix}
-  const
-    pqlib = 'libpq.'+sharedsuffix;
-{$ENDIF}
-{$IFDEF Windows}
-  const
-    pqlib = 'libpq.dll';
-{$ENDIF}
-
 {$i dllisttypes.inc}
 
 var
@@ -43,7 +34,7 @@ var
 { Macro translated }
 Function  DLE_VAL(elem : PDlelem) : pointer;
 
-Procedure InitialiseDllist(libpath:string=pqlib);
+Procedure InitialiseDllist(libpath:string);
 Procedure ReleaseDllist;
 
 var DllistLibraryHandle : TLibHandle;
@@ -52,7 +43,7 @@ implementation
 
 var RefCount : integer;
 
-Procedure InitialiseDllist(libpath:string=pqlib);
+Procedure InitialiseDllist(libpath:string);
 
 begin
   inc(RefCount);

packages/postgres/src/postgres3dyn.pp

@@ -25,7 +25,7 @@ uses
     pqlib  = pqlib5;
 {$endif}
 {$ENDIF}
-{$IFDEF Win32}
+{$IFDEF Windows}
   const
     pqlib = 'libpq.dll'; // Not sure if it has a version number ?
 {$ENDIF}