@@ -72,11 +72,11 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
7272/* Dialog for 'No preferences directory' */
7373#define NOPREFDIR_ID 133
7474
75- /* Dialog for 'Create preferences file? ' */
76- #define NOPREFFILE_ID 134
77- #define NOPREFFILE_YES 1
78- #define NOPREFFILE_NO 2
79-
75+ /* Dialog for 'Bad or outdated preferences ' */
76+ #define BADPREFERENCES_ID 134
77+ #define BADPREF_DELETE 1
78+ #define BADPREF_CONTINUE 2
79+ #define BADPREF_QUIT 3
8080/* Dialog for 'Bad preference file' */
8181#define BADPREFFILE_ID 135
8282
@@ -128,18 +128,19 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
128128#define PYTHONOPTIONSOVERRIDE_ID 129
129129#define POPT_INSPECT 0
130130#define POPT_VERBOSE 1
131- #define POPT_SUPPRESS 2
131+ #define POPT_OPTIMIZE 2
132132#define POPT_UNBUFFERED 3
133133#define POPT_DEBUGGING 4
134134#define POPT_KEEPNORM 5
135135#define POPT_KEEPERR 6
136- #define POPT_NOINTOPT 7 /* Not settable interactively */
137- #define POPT_NOARGS 8 /* Not settable interactively */
136+
137+ #define POPT_VERSION_CURRENT 3 /* Current version number */
138138
139139typedef struct PyMac_PrefRecord {
140+ unsigned char version ;
140141 unsigned char inspect ;
141142 unsigned char verbose ;
142- unsigned char suppress_print ;
143+ unsigned char optimize ;
143144 unsigned char unbuffered ;
144145 unsigned char debugging ;
145146 unsigned char keep_normal ;
@@ -154,5 +155,4 @@ typedef struct PyMac_PrefRecord {
154155
155156/* From macgetpath.c: */
156157void PyMac_PreferenceOptions Py_PROTO ((PyMac_PrefRecord * ) );
157-
158-
158+ char * PyMac_GetPythonDir Py_PROTO ((void ));
0 commit comments