Added pascal-style string name of preference file resource, and bracketed

C struct declarations with #ifndef rez

diff --git a/Mac/Include/pythonresources.h b/Mac/Include/pythonresources.h
index 8cd47a318a558e29adfa1974fd497503baee5348..8f6c227efd593a829d992e2f49e18d4c9587fd4f 100644 (file)
--- a/Mac/Include/pythonresources.h
+++ b/Mac/Include/pythonresources.h
@@ -116,7 +116,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 /* The STR resource that holds the preference file name */
-/* #define PREFFILENAME_ID 228 */
+#define PREFFILENAME_ID 228            /* For Rez only */
+#define PREFFILENAME_PASCAL_NAME "PythonPreferenceFileName"
 #define PREFFILENAME_NAME "\pPythonPreferenceFileName"
 
 /* The STR# resource for sys.path initialization */
@@ -142,6 +143,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define POPT_VERSION_CURRENT   4       /* Current version number */
 
+#ifndef rez
 typedef struct PyMac_PrefRecord {
        unsigned char   version;
        unsigned char   inspect;
@@ -156,11 +158,14 @@ typedef struct PyMac_PrefRecord {
        unsigned char   oldexc;
        unsigned char   nosite;
 } PyMac_PrefRecord;
+#endif
 
 /* The GUSI options resources */
 #define GUSIOPTIONS_ID 10240
 #define GUSIOPTIONSOVERRIDE_ID 10241
 
+#ifndef rez
 /* From macgetpath.c: */
 void PyMac_PreferenceOptions Py_PROTO((PyMac_PrefRecord *));
 char * PyMac_GetPythonDir Py_PROTO((void));
+#endif
\ No newline at end of file