From 245d17930b019f58d38c0ceae1eb73cf98a54f5c Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Sat, 30 Jan 1999 13:21:24 +0000 Subject: Added pascal-style string name of preference file resource, and bracketed C struct declarations with #ifndef rez --- Mac/Include/pythonresources.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Mac/Include/pythonresources.h b/Mac/Include/pythonresources.h index 8cd47a3..8f6c227 100644 --- 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 -- cgit v0.12