[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas/src mac/geas-mac.pbproj/project.pbxpr...
|
From: |
Neil Tiffin |
|
Subject: |
gnue/geas/src mac/geas-mac.pbproj/project.pbxpr... |
|
Date: |
Sat, 15 Sep 2001 18:29:32 -0400 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Neil Tiffin <address@hidden> 01/09/15 18:29:32
Modified files:
geas/src/mac/geas-mac.pbproj: project.pbxproj
geas/src/methods: methods.c methods.h methods_python.c
Log message:
Methods should compile now.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.c.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.h.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.c.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj
diff -u gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj:1.4
gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj:1.5
--- gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj:1.4 Sat Sep 15
10:45:01 2001
+++ gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj Sat Sep 15 18:29:32 2001
@@ -106,10 +106,10 @@
010E7DAB009C71FB7F000001,
010E7DCA009C728F7F000001,
26844D5300C6FE827F000001,
- 1484245300C858697F000001,
5B886B0F00CEF1637F000001,
011720DF00D25EDA7F000001,
F5FE2AE9015384EF01000001,
+ F596A61101540B3701000001,
);
isa = PBXGroup;
name = Headers;
@@ -446,18 +446,6 @@
settings = {
};
};
- 01105B9900C7D1727F000001 = {
- isa = PBXFileReference;
- name = libpq.a;
- path = /usr/local/pgsql/lib/libpq.a;
- refType = 0;
- };
- 01105B9A00C7D1727F000001 = {
- fileRef = 01105B9900C7D1727F000001;
- isa = PBXBuildFile;
- settings = {
- };
- };
01105B9B00C7D20E7F000001 = {
isa = PBXFileReference;
name = libssl.0.9.dylib;
@@ -597,7 +585,6 @@
F575A880013569A201000001,
01105B8A00C7CF9F7F000001,
F575A878013568B501000001,
- 01105B9900C7D1727F000001,
01105B9B00C7D20E7F000001,
5B886B1100CEF4727F000001,
F5FE2AEB0153872301000001,
@@ -605,6 +592,7 @@
F5FE2AEF0153952301000001,
F5FE2AF10153965301000001,
F5FE2AF30153970101000001,
+ F596A61201540B3701000001,
);
isa = PBXGroup;
name = Libraries;
@@ -686,7 +674,7 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS =
"/Volumes/AnagadaII/gnue/geas/src/oql
/Volumes/AnagadaII/gnue/geas/src/objectcache
/Volumes/AnagadaII/gnue/geas/src/objectstore
/Volumes/AnagadaII/gnue/geas/src/lib /Volumes/AnagadaII/gnue/geas/src/config
/Volumes/AnagadaII/gnue/geas/src/methods /Volumes/AnagadaII/gnue/geas/src
/Volumes/AnagadaII/sw/include";
INSTALL_PATH = /Volumes/AnagadaII/gnue/geas/src;
- LIBRARY_SEARCH_PATHS =
"/Volumes/AnagadaII/sw/lib /usr/local/pgsql/lib /Volumes/AnagadaII/sw/lib/mysql
/Volumes/AnagadaII/sw/lib/python2.1/config /usr/X11R6/lib";
+ LIBRARY_SEARCH_PATHS =
"/Volumes/AnagadaII/sw/lib /Volumes/AnagadaII/sw/lib/mysql
/Volumes/AnagadaII/sw/lib/python2.1/config /usr/X11R6/lib";
OPTIMIZATION_CFLAGS = "";
OTHER_CFLAGS = "-traditional-cpp -g
-DHAVE_GETOPT_H -DHAVE_CONFIG_H -DUSE_SERVANT_MANAGER
-DGEAS_DATA_DIR=\\\\\\\"../../\\\\\\\"
-DGEAS_SYSRC=\\\\\\\"../../geas.conf\\\\\\\" -DGEAS_PID_DIR=\\\\\\\"../\\\\\\\"
-DGEAS_IOR_DIR=\\\\\\\"../\\\\\\\"";
OTHER_LDFLAGS = "";
@@ -735,7 +723,6 @@
26844D8B00C7081F7F000001,
26844D8C00C7081F7F000001,
26844D9300C708497F000001,
- 1484245400C858697F000001,
1750FE2300CAAB147F000001,
011A185900CE5E957F000001,
5B886B1000CEF1637F000001,
@@ -744,6 +731,7 @@
F5101CBD0152D4B901000001,
F5101CBE0152D4B901000001,
F5FE2AEA015384EF01000001,
+ F596A61301540B3701000001,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@@ -792,7 +780,6 @@
010E7DC9009C72577F000001,
26844D4E00C6FE0E7F000001,
01105B9000C7CF9F7F000001,
- 01105B9A00C7D1727F000001,
01105B9C00C7D20E7F000001,
5B886B1200CEF4727F000001,
F575A879013568B501000001,
@@ -805,6 +792,7 @@
F5FE2AF00153952301000001,
F5FE2AF20153965301000001,
F5FE2AF40153970201000001,
+ F596A61401540B3701000001,
);
isa = PBXFrameworksBuildPhase;
name = "Frameworks & Libraries";
@@ -821,28 +809,6 @@
//082
//083
//084
-//140
-//141
-//142
-//143
-//144
- 1484245300C858697F000001 = {
- isa = PBXFileReference;
- name = "libpq-fe.h";
- path = "/usr/local/pgsql/include/libpq-fe.h";
- refType = 0;
- };
- 1484245400C858697F000001 = {
- fileRef = 1484245300C858697F000001;
- isa = PBXBuildFile;
- settings = {
- };
- };
-//140
-//141
-//142
-//143
-//144
//170
//171
//172
@@ -1404,6 +1370,30 @@
};
F575A881013569A201000001 = {
fileRef = F575A880013569A201000001;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F596A61101540B3701000001 = {
+ isa = PBXFileReference;
+ name = "libpq-fe.h";
+ path =
"/Volumes/AnagadaII/sw/include/postgresql/libpq-fe.h";
+ refType = 0;
+ };
+ F596A61201540B3701000001 = {
+ isa = PBXFileReference;
+ name = libpq.a;
+ path = /Volumes/AnagadaII/sw/lib/libpq.a;
+ refType = 0;
+ };
+ F596A61301540B3701000001 = {
+ fileRef = F596A61101540B3701000001;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F596A61401540B3701000001 = {
+ fileRef = F596A61201540B3701000001;
isa = PBXBuildFile;
settings = {
};
Index: gnue/geas/src/methods/methods.c
diff -u gnue/geas/src/methods/methods.c:1.15
gnue/geas/src/methods/methods.c:1.16
--- gnue/geas/src/methods/methods.c:1.15 Sat Sep 15 10:45:01 2001
+++ gnue/geas/src/methods/methods.c Sat Sep 15 18:29:32 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods.c,v 1.15 2001/09/15 14:45:01 ntiffin Exp $
+ $Id: methods.c,v 1.16 2001/09/15 22:29:32 ntiffin Exp $
*/
#include "config.h"
@@ -36,8 +36,6 @@
#include "methods_python.h"
#include "methods_glibmodule.h"
-static void free_provider_data (provider_t * p);
-
gboolean
initialise_method_handling (configuration config)
{
@@ -85,7 +83,7 @@
// end of general dispatch routines
-static provider_t *
+provider_t *
alloc_provider_data (const char *classname, const char *cid,
const char *methodname, void *extra)
{
@@ -131,7 +129,7 @@
return (NULL);
}
-static void
+void
free_provider_data (provider_t * p)
{
CORBA_Environment ev; /* really just ignoring exceptions */
Index: gnue/geas/src/methods/methods.h
diff -u gnue/geas/src/methods/methods.h:1.9 gnue/geas/src/methods/methods.h:1.10
--- gnue/geas/src/methods/methods.h:1.9 Sat Sep 15 10:45:01 2001
+++ gnue/geas/src/methods/methods.h Sat Sep 15 18:29:32 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods.h,v 1.9 2001/09/15 14:45:01 ntiffin Exp $
+ $Id: methods.h,v 1.10 2001/09/15 22:29:32 ntiffin Exp $
*/
#ifndef METHODS_H
@@ -52,7 +52,8 @@
const char *methodname,
GEAS_Arguments * args, CORBA_Environment * ev);
-static provider_t *alloc_provider_data (const char *classname,
+provider_t *alloc_provider_data (const char *classname,
const char *cid,
const char *methodname, void *extra);
+void free_provider_data (provider_t * p);
#endif
Index: gnue/geas/src/methods/methods_python.c
diff -u gnue/geas/src/methods/methods_python.c:1.3
gnue/geas/src/methods/methods_python.c:1.4
--- gnue/geas/src/methods/methods_python.c:1.3 Sat Sep 15 10:45:01 2001
+++ gnue/geas/src/methods/methods_python.c Sat Sep 15 18:29:32 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods_python.c,v 1.3 2001/09/15 14:45:01 ntiffin Exp $
+ $Id: methods_python.c,v 1.4 2001/09/15 22:29:32 ntiffin Exp $
*/
/*
@@ -342,7 +342,7 @@
CORBA_Environment * ev)
{
char *retval = NULL;
- int i;
+ // int i;
PyObject *result;
PyObject *l, *tuple;
PyObject *pyobj, *server;