Got rid of nfullpath()

diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
index 91e63ebcd711c76f42481b74d9d6907c1bcfad23..e8a7fb9549e50d07189fef5f3d37ddccef43ca92 100644 (file)
--- a/Mac/Modules/macfsmodule.c
+++ b/Mac/Modules/macfsmodule.c
@@ -33,7 +33,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <Aliases.h>
 #include <LowMem.h>
 
-#include "nfullpath.h"
 #include "getapplbycreator.h"
 
 #ifdef THINK_C
@@ -406,7 +405,7 @@ mfss_as_pathname(self, args)
 
        if (!newgetargs(args, ""))
                return NULL;
-       err = nfullpath(&self->fsspec, strbuf);
+       err = PyMac_GetFullPath(&self->fsspec, strbuf);
        if ( err ) {
                PyErr_Mac(ErrorObject, err);
                return NULL;

diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 5ad53b4c22efa338ab18cd3aa906df3c308bb4f9..5c5e3c5aceab5c6139c23f7e69e2694d56d3eb8e 100644 (file)
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -584,7 +584,7 @@ MacOS_openrf(PyObject *self, PyObject *args)
                FILE *tfp;
                char pathname[257];
                
-               if ( err=nfullpath(&fss, &pathname) ) {
+               if ( err=PyMac_GetFullPath(&fss, pathname) ) {
                        PyMac_Error(err);
                        Py_DECREF(fp);
                        return NULL;