CVS Commit by andreas: gcc filename collision fix

[cvs(at)cvs(dot)pgadmin(dot)org]

Log Message:
-----------
gcc filename collision fix

Modified Files:
--------------
    pgadmin3/src:
        pgAdmin3.dsp (r1.104 -> r1.105)
    pgadmin3/src/db:
        pgConn.cpp (r1.50 -> r1.51)
    pgadmin3/src/schema:
        pgDatabase.cpp (r1.60 -> r1.61)
        pgIndex.cpp (r1.33 -> r1.34)
        pgTable.cpp (r1.55 -> r1.56)
        pgTablespace.cpp (r1.7 -> r1.8)
    pgadmin3/src/ui:
        frmStatus.cpp (r1.35 -> r1.36)

Added Files:
-----------
    pgadmin3/src/include:
        pgfeatures.h (r1.1)

Removed Files:
-------------
    pgadmin3/src/include:
        features.h

Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.104
retrieving revision 1.105
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.104 -r1.105
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -1397,6 +1397,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\pgfeatures.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\sysLogger.h
 # End Source File
 # Begin Source File
Index: pgConn.cpp
===================================================================
RCS file: /projects/pgadmin3/src/db/pgConn.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -Lsrc/db/pgConn.cpp -Lsrc/db/pgConn.cpp -u -w -r1.50 -r1.51
--- src/db/pgConn.cpp
+++ src/db/pgConn.cpp
@@ -16,7 +16,7 @@
 
 // PostgreSQL headers
 #include <libpq-fe.h>
-#include "features.h"
+#include "pgfeatures.h"
 
 // Network  headers
 #ifdef __WXMSW__
--- /dev/null
+++ src/include/pgfeatures.h
@@ -0,0 +1,18 @@
+//////////////////////////////////////////////////////////////////////////
+//
+// pgAdmin III - PostgreSQL Tools
+// RCS-ID:      $Id: pgfeatures.h,v 1.1 2004/07/25 20:45:58 andreas Exp $
+// Copyright (C) 2002 - 2004, The pgAdmin Development Team
+// This software is released under the Artistic Licence
+//
+// pgfeatures.h PostgreSQL features constants
+//
+//////////////////////////////////////////////////////////////////////////
+
+enum
+{
+    FEATURE_INITIALIZED=0,
+    FEATURE_SIZE,
+    FEATURE_FILEREAD,
+    FEATURE_LAST
+};
--- src/include/features.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//////////////////////////////////////////////////////////////////////////
-//
-// pgAdmin III - PostgreSQL Tools
-// RCS-ID:      $Id: features.h,v 1.1 2004/07/25 20:33:51 andreas Exp $
-// Copyright (C) 2002 - 2004, The pgAdmin Development Team
-// This software is released under the Artistic Licence
-//
-// features.h PostgreSQL features constants
-//
-//////////////////////////////////////////////////////////////////////////
-
-enum
-{
-    FEATURE_INITIALIZED=0,
-    FEATURE_SIZE,
-    FEATURE_FILEREAD,
-    FEATURE_LAST
-};
Index: pgTablespace.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgTablespace.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/schema/pgTablespace.cpp -Lsrc/schema/pgTablespace.cpp -u -w -r1.7 -r1.8
--- src/schema/pgTablespace.cpp
+++ src/schema/pgTablespace.cpp
@@ -16,7 +16,7 @@
 // App headers
 #include "pgAdmin3.h"
 #include "misc.h"
-#include "features.h"
+#include "pgfeatures.h"
 #include "pgObject.h"
 #include "pgTablespace.h"
 #include "pgCollection.h"
Index: pgDatabase.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgDatabase.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lsrc/schema/pgDatabase.cpp -Lsrc/schema/pgDatabase.cpp -u -w -r1.60 -r1.61
--- src/schema/pgDatabase.cpp
+++ src/schema/pgDatabase.cpp
@@ -15,7 +15,7 @@
 // App headers
 #include "pgAdmin3.h"
 #include "misc.h"
-#include "features.h"
+#include "pgfeatures.h"
 #include "pgDatabase.h"
 #include "pgObject.h"
 #include "pgServer.h"
Index: pgTable.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgTable.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lsrc/schema/pgTable.cpp -Lsrc/schema/pgTable.cpp -u -w -r1.55 -r1.56
--- src/schema/pgTable.cpp
+++ src/schema/pgTable.cpp
@@ -24,7 +24,7 @@
 #include "pgForeignKey.h"
 #include "pgCheck.h"
 #include "sysSettings.h"
-#include "features.h"
+#include "pgfeatures.h"
 
 pgTable::pgTable(pgSchema *newSchema, const wxString& newName)
 : pgSchemaObject(newSchema, PG_TABLE, newName)
Index: pgIndex.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgIndex.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lsrc/schema/pgIndex.cpp -Lsrc/schema/pgIndex.cpp -u -w -r1.33 -r1.34
--- src/schema/pgIndex.cpp
+++ src/schema/pgIndex.cpp
@@ -15,7 +15,7 @@
 // App headers
 #include "pgAdmin3.h"
 #include "misc.h"
-#include "features.h"
+#include "pgfeatures.h"
 #include "pgObject.h"
 #include "pgIndex.h"
 #include "pgIndexConstraint.h"
Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.35 -r1.36
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -19,7 +19,7 @@
 
 // App headers
 #include "frmStatus.h"
-#include "features.h"
+#include "pgfeatures.h"
 // Icons
 #include "images/pgAdmin3.xpm"