home *** CD-ROM | disk | FTP | other *** search
/ Language/OS - Multiplatform Resource Library / LANGUAGE OS.iso / scheme / schematk / compile.doc < prev    next >
Encoding:
Text File  |  1993-07-22  |  4.8 KB  |  146 lines

  1. Although the Schematik 1.1.5.2 executable (produced under NeXTstep
  2. 2.2) seems to run just fine under NeXTstep 3.0, the sources will not
  3. compile as-is under 3.0.  The following diffs will make the sources
  4. compile under 3.0, and the resulting executable seems to work the
  5. same.  However, the testing has not been very thorough.  A future
  6. release of the Schematik sources will hopefully be directly compilable
  7. under 3.0; in the meantime, you are welcome to try using these diffs.
  8.   -Max Hailperin <max@nic.gac.edu>, 3/10/93
  9.   (Thanks to Chris Kane for the diffs.)
  10. ====================
  11. diff -r Schematik_1.1.5.2/Schematik_main.m Schematik_1.1.5.2_for_3.0/Schematik_main.m
  12. 41a42
  13. > extern int errno;
  14. 45c46
  15. < char *stlchr(const char *, int);
  16. ---
  17. > char *stlchr(char *, int);
  18. diff -r Schematik_1.1.5.2/Agent.subproj/FindAgent.m Schematik_1.1.5.2_for_3.0/Agent.subproj/FindAgent.m
  19. 44c44
  20. < #import <mach.h>
  21. ---
  22. > #import <mach/mach.h>
  23. diff -r Schematik_1.1.5.2/Agent.subproj/HelpAgent.m Schematik_1.1.5.2_for_3.0/Agent.subproj/HelpAgent.m
  24. 46c46
  25. < #import <mach.h>
  26. ---
  27. > #import <mach/mach.h>
  28. 289c289
  29. < - initFrame:(NXRect *)aRect
  30. ---
  31. > - initFrame:(const NXRect *)aRect
  32. diff -r Schematik_1.1.5.2/Agent.subproj/InfoAgent.m Schematik_1.1.5.2_for_3.0/Agent.subproj/InfoAgent.m
  33. 40c40
  34. < #import <mach.h>
  35. ---
  36. > #import <mach/mach.h>
  37. diff -r Schematik_1.1.5.2/Agent.subproj/PrefAgent.m Schematik_1.1.5.2_for_3.0/Agent.subproj/PrefAgent.m
  38. 44c44
  39. < #import <appkit/defaults.h>
  40. ---
  41. > #import <defaults/defaults.h>
  42. 49c49
  43. < #import <mach.h>
  44. ---
  45. > #import <mach/mach.h>
  46. 316c316
  47. <     return (retval?:[NXApp loadNibSection:nibFile owner:owner withNames:NO fromZone:zone]);
  48. ---
  49. >     return (retval?retval:[NXApp loadNibSection:nibFile owner:owner withNames:NO fromZone:zone]);
  50. 361c361
  51. <     return (retval?:[[NXImage allocFromZone:zone] initFromSection:imageFile]);
  52. ---
  53. >     return (retval?retval:[[NXImage allocFromZone:zone] initFromSection:imageFile]);
  54. 366c366,367
  55. <     return ([stringTable valueForStringKey:key]?:(value?:key));
  56. ---
  57. >   const char *val=[stringTable valueForStringKey:key];
  58. >     return (val?val:(value?value:key));
  59. diff -r Schematik_1.1.5.2/Doc.subproj/DocText.m Schematik_1.1.5.2_for_3.0/Doc.subproj/DocText.m
  60. 50c50
  61. < #import <nextdev/keycodes.h>
  62. ---
  63. > #import <dev/m68k/keycodes.h>
  64. 52c52
  65. < #import <NXCType.h>
  66. ---
  67. > #import <appkit/NXCType.h>
  68. 125c125
  69. < - initFrame:(NXRect *)r
  70. ---
  71. > - initFrame:(const NXRect *)r
  72. 130c130
  73. < - initFrame:(NXRect *)r text:(const char *)text alignment:(int)mode
  74. ---
  75. > - initFrame:(const NXRect *)r text:(const char *)text alignment:(int)mode
  76. diff -r Schematik_1.1.5.2/Doc.subproj/DocWin.m Schematik_1.1.5.2_for_3.0/Doc.subproj/DocWin.m
  77. 45c45
  78. < #import <sys/malloc.h>
  79. ---
  80. > //#import <sys/malloc.h>
  81. 47,48c47,48
  82. < #import <mach.h>
  83. < #import <NXCType.h>
  84. ---
  85. > #import <mach/mach.h>
  86. > #import <appkit/NXCType.h>
  87. diff -r Schematik_1.1.5.2/Doc.subproj/InteractionWin.m Schematik_1.1.5.2_for_3.0/Doc.subproj/InteractionWin.m
  88. 43c43
  89. < #import <mach.h>
  90. ---
  91. > #import <mach/mach.h>
  92. diff -r Schematik_1.1.5.2/Graphics.subproj/GraphicsView.m Schematik_1.1.5.2_for_3.0/Graphics.subproj/GraphicsView.m
  93. 48,49c48,49
  94. < #import <defaults.h>
  95. < #import <mach.h>
  96. ---
  97. > #import <defaults/defaults.h>
  98. > #import <mach/mach.h>
  99. 127c127
  100. <     theWindow = [[Panel allocFromZone:[self zone]] initContent:frameRect style:NX_RESIZEBARSTYLE backing:NX_BUFFERED buttonMask:NX_RESIZEBUTTONMASK|NX_MINIATURIZEBUTTONMASK defer:NO];
  101. ---
  102. >     theWindow = [[Panel allocFromZone:[self zone]] initContent:frameRect style:NX_RESIZEBARSTYLE backing:NX_BUFFERED buttonMask:NX_MINIATURIZEBUTTONMASK defer:NO];
  103. 143c143
  104. < - drawSelf:(NXRect *)r :(int)rectCount
  105. ---
  106. > - drawSelf:(const NXRect *)r :(int)rectCount
  107. diff -r Schematik_1.1.5.2/Main.subproj/Main.m Schematik_1.1.5.2_for_3.0/Main.subproj/Main.m
  108. 59c59
  109. < #import <mach.h>
  110. ---
  111. > #import <mach/mach.h>
  112. 309c309
  113. < - (BOOL)app:sender openFile:(const char *)file type:(const char *)aType
  114. ---
  115. > - (int)app:sender openFile:(const char *)file type:(const char *)aType
  116. 316c316
  117. <       return NO;
  118. ---
  119. >       return 0;
  120. 321c321
  121. <     return YES;
  122. ---
  123. >     return 1;
  124. 361c361
  125. <       if (![appSpeaker extendPowerOffBy:600000 actual:&actual])
  126. ---
  127. >       if (![[Application workspace] extendPowerOffBy:600000])
  128. diff -r Schematik_1.1.5.2/Main.subproj/SchemeProtocol.m Schematik_1.1.5.2_for_3.0/Main.subproj/SchemeProtocol.m
  129. 46c46
  130. < #import <defaults.h>
  131. ---
  132. > #import <defaults/defaults.h>
  133. 49,50c49,50
  134. < #import <mach.h>
  135. < #import <NXCType.h> 
  136. ---
  137. > #import <mach/mach.h>
  138. > #import <appkit/NXCType.h> 
  139. 229a230,231
  140. >     char *host=NXGetDefaultValue([NXApp appName],"NXHost");
  141. >     char *ps=NXGetDefaultValue([NXApp appName],"NXPSName");
  142. 231c233
  143. <     sprintf(buffer,"%i\n%s\n%s\n",windowNum, (NXGetDefaultValue([NXApp appName],"NXHost")?:"\0"), (NXGetDefaultValue([NXApp appName],"NXPSName")?:"\0"));
  144. ---
  145. >     sprintf(buffer,"%i\n%s\n%s\n",windowNum, (host?host:"\0"), (ps?ps:"\0"));
  146.