Change 14070: Updates for Universal Headers 3.4

[email protected] (Chris Nandor) Fri, 4 Jan 2002 16:53:14 -0500
Newsgroups	perl.perl5.changes.mac
Message-ID	<p05100308b85bd4a9c3bf@[10.0.1.177]>
Change 14070 by pudge@pudge-mobile on 2002/01/04 20:32:57

	Updates for Universal Headers 3.4

Affected files ...

.... //depot/maint-5.6/macperl/macos/SubLaunch.c#2 edit
.... //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/Navigation.xs#3 edit
.... //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/typemap#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPAEUtils.c#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPAEVTStream.cp#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPAppleEvents.c#3 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPEditions.c#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPEditor.c#4 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPFile.c#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPGlobals.c#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPHelp.c#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPMain.c#4 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPPreferences.c#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPPseudoFile.cp#2 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPSave.c#3 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPScript.c#6 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPUtils.c#3 edit
.... //depot/maint-5.6/macperl/macos/macperl/MPWindow.c#2 edit

Differences ...

==== //depot/maint-5.6/macperl/macos/SubLaunch.c#2 (text) ====
Index: perl/macos/SubLaunch.c
--- perl/macos/SubLaunch.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/SubLaunch.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 	as specified in the README file.
 
 $Log: SubLaunch.c,v $
+Revision 1.2  2002/01/04 03:40:35  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/08/14 01:48:17  neeri
 Checked into Sourceforge
 
@@ -18,6 +21,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 /* We need glue for Gestalt, but not for the rest of the stuff */
 
 #include <Gestalt.h>

==== //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/Navigation.xs#3 (text) ====
Index: perl/macos/ext/Mac/Navigation/Navigation.xs
--- perl/macos/ext/Mac/Navigation/Navigation.xs.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/ext/Mac/Navigation/Navigation.xs	Fri Jan  4 13:45:05 2002
@@ -272,6 +272,22 @@
 	EventRecord 	event;
 
 =cut
+
+#if UNIVERSAL_INTERFACES_VERSION >= 0x0340
+
+STRUCT * NavCBRec
+	U16 			version;
+	NavDialogRef	context;					/* used by customization code to call Navigation Services */
+	GrafPtr 		window;						/* the dialog */
+	Rect 			customRect;					/* local coordinate rectangle of customization area */
+	Rect 			previewRect;				/* local coordinate rectangle of the preview area */
+	EventRecord 	event;
+		READ_ONLY
+		OUTPUT:
+		XS_OUTPUT(ToolboxEvent, &STRUCT->eventData.eventDataParms.event, $arg);
+
+#else
+
 STRUCT * NavCBRec
 	U16 			version;
 	U32		 		context;					/* used by customization code to call Navigation Services */
@@ -283,6 +299,8 @@
 		OUTPUT:
 		XS_OUTPUT(ToolboxEvent, &STRUCT->eventData.eventDataParms.event, $arg);
 
+#endif
+
 =item NavDialogOptions
 
 Options for a Navigation dialog. Fields are:

==== //depot/maint-5.6/macperl/macos/ext/Mac/Navigation/typemap#2 (text) ====
Index: perl/macos/ext/Mac/Navigation/typemap
--- perl/macos/ext/Mac/Navigation/typemap.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/ext/Mac/Navigation/typemap	Fri Jan  4 13:45:05 2002
@@ -1,4 +1,5 @@
 TYPEMAP
+NavDialogRef		T_PTROBJ
 NavFileInfo			T_PTROBJ
 NavFolderInfo		T_PTROBJ
 NavFileOrFolderInfo	T_PTROBJ

==== //depot/maint-5.6/macperl/macos/macperl/MPAEUtils.c#2 (text) ====
Index: perl/macos/macperl/MPAEUtils.c
--- perl/macos/macperl/MPAEUtils.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPAEUtils.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPAEUtils.c,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:28  neeri
 Sources & Resources
 
@@ -27,6 +30,7 @@
 #pragma segment Main
 #endif
 
+#include <stdio.h>
 #include "MPAEUtils.h"
 #include "MPUtils.h"
 

==== //depot/maint-5.6/macperl/macos/macperl/MPAEVTStream.cp#2 (text) ====
Index: perl/macos/macperl/MPAEVTStream.cp
--- perl/macos/macperl/MPAEVTStream.cp.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPAEVTStream.cp	Fri Jan  4 13:45:05 2002
@@ -5,6 +5,9 @@
 Language	:	MPW C/C++
 
 $Log: MPAEVTStream.cp,v $
+Revision 1.4  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.3  2001/04/28 23:28:01  neeri
 Need to register MPAEVTStreamDevice (MacPerl Bug #418932)
 
@@ -16,6 +19,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #define GUSI_SOURCE
 #define GUSI_INTERNAL
 

==== //depot/maint-5.6/macperl/macos/macperl/MPAppleEvents.c#3 (text) ====
Index: perl/macos/macperl/MPAppleEvents.c
--- perl/macos/macperl/MPAppleEvents.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPAppleEvents.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPAppleEvents.c,v $
+Revision 1.4  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.3  2001/10/22 19:28:01  pudge
 Sync with perforce
 
@@ -54,6 +57,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include <AppleEvents.h>
 #include <LowMem.h>
 #include <Menus.h>

==== //depot/maint-5.6/macperl/macos/macperl/MPEditions.c#2 (text) ====
Index: perl/macos/macperl/MPEditions.c
--- perl/macos/macperl/MPEditions.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPEditions.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPEditions.c,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:29  neeri
 Sources & Resources
 
@@ -35,6 +38,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include <OSUtils.h>
 #include <Resources.h>
 #include <Errors.h>

==== //depot/maint-5.6/macperl/macos/macperl/MPEditor.c#4 (text) ====
Index: perl/macos/macperl/MPEditor.c
--- perl/macos/macperl/MPEditor.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPEditor.c	Fri Jan  4 13:45:05 2002
@@ -6,6 +6,9 @@
 Language	:	MPW C
 
 $Log: MPEditor.c,v $
+Revision 1.4  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.3  2001/09/26 21:51:15  pudge
 Sync with perforce maint-5.6/macperl/macos/macperl
 
@@ -29,6 +32,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include "MPGlobals.h"
 #include "MPEditor.h"
 #include "SubLaunch.h"

==== //depot/maint-5.6/macperl/macos/macperl/MPFile.c#2 (text) ====
Index: perl/macos/macperl/MPFile.c
--- perl/macos/macperl/MPFile.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPFile.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPFile.c,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:29  neeri
 Sources & Resources
 
@@ -44,6 +47,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include <Errors.h>
 #include <Resources.h>
 #include <PLStringFuncs.h>

==== //depot/maint-5.6/macperl/macos/macperl/MPGlobals.c#2 (text) ====
Index: perl/macos/macperl/MPGlobals.c
--- perl/macos/macperl/MPGlobals.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPGlobals.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPGlobals.c,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:29  neeri
 Sources & Resources
 
@@ -37,4 +40,6 @@
 
 #define EXTERN 
 
+#include <stdio.h>
+
 #include "MPGlobals.h"

==== //depot/maint-5.6/macperl/macos/macperl/MPHelp.c#2 (text) ====
Index: perl/macos/macperl/MPHelp.c
--- perl/macos/macperl/MPHelp.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPHelp.c	Fri Jan  4 13:45:05 2002
@@ -5,6 +5,9 @@
 Language	:	MPW C
 
 $Log: MPHelp.c,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:29  neeri
 Sources & Resources
 
@@ -31,6 +34,11 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
+// ignore CGBase.h int types
+#define _STDINT_H_
+
 #include "MPHelp.h"
 #include "MPConsole.h"
 #include "MPUtils.h"

==== //depot/maint-5.6/macperl/macos/macperl/MPMain.c#4 (text) ====
Index: perl/macos/macperl/MPMain.c
--- perl/macos/macperl/MPMain.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPMain.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPMain.c,v $
+Revision 1.6  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.5  2001/11/08 06:01:40  neeri
 Change ExitToShell() to exit(0) to fix nasty GUSI crash (MacPerl Bug #467732)
 
@@ -71,6 +74,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #define MP_EXT 
 #define MP_INIT(x) = x
 

==== //depot/maint-5.6/macperl/macos/macperl/MPPreferences.c#2 (text) ====
Index: perl/macos/macperl/MPPreferences.c
--- perl/macos/macperl/MPPreferences.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPPreferences.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPPreferences.c,v $
+Revision 1.9  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.8  2001/04/24 05:11:32  pudge
 Remove extra : at end of TMPDIR in prefs
 
@@ -47,6 +50,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include "MPPreferences.h"
 #include "MPUtils.h"
 #include "MPWindow.h"

==== //depot/maint-5.6/macperl/macos/macperl/MPPseudoFile.cp#2 (text) ====
Index: perl/macos/macperl/MPPseudoFile.cp
--- perl/macos/macperl/MPPseudoFile.cp.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPPseudoFile.cp	Fri Jan  4 13:45:05 2002
@@ -4,6 +4,9 @@
 Author	:	Matthias Neeracher
 Language	:	MPW C/C++
 $Log: MPPseudoFile.cp,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:29  neeri
 Sources & Resources
 
@@ -18,6 +21,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #define GUSI_SOURCE
 #define GUSI_INTERNAL
 

==== //depot/maint-5.6/macperl/macos/macperl/MPSave.c#3 (text) ====
Index: perl/macos/macperl/MPSave.c
--- perl/macos/macperl/MPSave.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPSave.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPSave.c,v $
+Revision 1.3  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.2  2001/10/03 19:23:16  pudge
 Sync with perforce maint-5.6/macperl
 
@@ -32,6 +35,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include <Errors.h>
 #include <Resources.h>
 #include <PLStringFuncs.h>

==== //depot/maint-5.6/macperl/macos/macperl/MPScript.c#6 (text) ====
Index: perl/macos/macperl/MPScript.c
--- perl/macos/macperl/MPScript.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPScript.c	Fri Jan  4 13:45:05 2002
@@ -5,6 +5,12 @@
 Language	:	MPW C
 
 $Log: MPScript.c,v $
+Revision 1.9  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
+Revision 1.8  2001/12/19 22:51:42  pudge
+Reset $^E each script
+
 Revision 1.7  2001/11/13 04:06:35  pudge
 Remov unused AddErrorDescription
 
@@ -49,6 +55,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #define ORIGINAL_WRAPPER
 
 #include "MPScript.h"

==== //depot/maint-5.6/macperl/macos/macperl/MPUtils.c#3 (text) ====
Index: perl/macos/macperl/MPUtils.c
--- perl/macos/macperl/MPUtils.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPUtils.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPUtils.c,v $
+Revision 1.3  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.2  2001/10/03 19:23:16  pudge
 Sync with perforce maint-5.6/macperl
 
@@ -47,6 +50,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include "MPUtils.h"
 #include "MPWindow.h"
 #include "patchlevel.h"

==== //depot/maint-5.6/macperl/macos/macperl/MPWindow.c#2 (text) ====
Index: perl/macos/macperl/MPWindow.c
--- perl/macos/macperl/MPWindow.c.~1~	Fri Jan  4 13:45:05 2002
+++ perl/macos/macperl/MPWindow.c	Fri Jan  4 13:45:05 2002
@@ -9,6 +9,9 @@
 Language	:	MPW C
 
 $Log: MPWindow.c,v $
+Revision 1.2  2002/01/04 03:34:45  pudge
+Modifications for universal headers 3.4
+
 Revision 1.1  2000/11/30 08:37:29  neeri
 Sources & Resources
 
@@ -44,6 +47,8 @@
 
 *********************************************************************/
 
+#include <stdio.h>
+
 #include <Resources.h>
 #include <Scrap.h>
 #include <Packages.h>
End of Patch.