Fix build on -current boxes.

This commit is contained in:
Steve Price 1999-12-23 21:16:26 +00:00
parent 367b1822b7
commit 0f4439fcd3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=23937
3 changed files with 138 additions and 0 deletions

View file

@ -0,0 +1,80 @@
--- main.C.orig Sun Dec 12 14:34:28 1999
+++ main.C Sun Dec 12 14:39:33 1999
@@ -44,53 +44,53 @@
static XtResource gres[] = {
{ "aboutString", "AboutString", XtRString, sizeof (char *),
- 0, XtRString, "XShisen " XSHISEN_VERSION " by Masaoki Kobayashi" },
+ 0, XtRString, (XtPointer)"XShisen " XSHISEN_VERSION " by Masaoki Kobayashi" },
{ "tedumari", "Tedumari", XtRString, sizeof (char *),
- offsetof(GlobRes, tedumari), XtRString, "You can get no more pieces." },
+ offsetof(GlobRes, tedumari), XtRString, (XtPointer)"You can get no more pieces." },
{ "width", "Width", XtRInt, sizeof (int),
- offsetof(GlobRes, Width), XtRString, "640" },
+ offsetof(GlobRes, Width), XtRString, (XtPointer)"640" },
{ "height", "Height", XtRInt, sizeof (int),
- offsetof(GlobRes, Height), XtRString, "400" },
+ offsetof(GlobRes, Height), XtRString, (XtPointer)"400" },
{ "timeFormat", "TimeFormat", XtRString, sizeof (char *),
- offsetof(GlobRes, timeFormat), XtRString, "Your time is %2.2d:%2.2d." },
+ offsetof(GlobRes, timeFormat), XtRString, (XtPointer)"Your time is %2.2d:%2.2d." },
{ "displayFormat1", "DisplayFormat1", XtRString, sizeof (char *),
- offsetof(GlobRes, displayFormat1), XtRString, "Rest: " },
+ offsetof(GlobRes, displayFormat1), XtRString, (XtPointer)"Rest: " },
{ "displayFormat2", "DisplayFormat2", XtRString, sizeof (char *),
- offsetof(GlobRes, displayFormat2), XtRString, "Time: " },
+ offsetof(GlobRes, displayFormat2), XtRString, (XtPointer)"Time: " },
{ "scoreFile", "ScoreFile", XtRString, sizeof (char *),
- offsetof(GlobRes, scoreFile), XtRString, "%s/xshisen-scores" },
+ offsetof(GlobRes, scoreFile), XtRString, (XtPointer)"%s/xshisen-scores" },
{ "personalScore", "PersonalScore", XtRString, sizeof (char *),
- offsetof(GlobRes, personalScoreFile), XtRString, ".xshisen-scores" },
+ offsetof(GlobRes, personalScoreFile), XtRString, (XtPointer)".xshisen-scores" },
{ "scoreOnly", "ScoreOnly", XtRBoolean, sizeof (Boolean),
- offsetof(GlobRes, scoreOnly), XtRString, "False" },
+ offsetof(GlobRes, scoreOnly), XtRString, (XtPointer)"False" },
{ "connectLineColor", "ConnectLineColor", XtRPixel, sizeof (Pixel),
- offsetof(GlobRes, connLineColor), XtRString, "blue" },
+ offsetof(GlobRes, connLineColor), XtRString, (XtPointer)"blue" },
{ "connectLineTime", "ConnectLineTime", XtRInt, sizeof (int),
- offsetof(GlobRes, connLineTime), XtRString, "1000" },
+ offsetof(GlobRes, connLineTime), XtRString, (XtPointer)"1000" },
{ "connectLineWidth", "ConnectLineWidth", XtRInt, sizeof (int),
- offsetof(GlobRes, connLineWidth), XtRString, "6" },
+ offsetof(GlobRes, connLineWidth), XtRString, (XtPointer)"6" },
{ "autoDemo", "AutoDemo", XtRBoolean, sizeof (Boolean),
- offsetof(GlobRes, autoDemo), XtRString, "False" },
+ offsetof(GlobRes, autoDemo), XtRString, (XtPointer)"False" },
{ "libraryDirectory", "LibraryDirectory", XtRString, sizeof (char *),
- offsetof(GlobRes, libDir), XtRString, LIB_DIR },
+ offsetof(GlobRes, libDir), XtRString, (XtPointer)LIB_DIR },
{ "magnifyFactor", "MagnifyFactor", XtRFloat, sizeof (float),
- offsetof(GlobRes, magFactor), XtRString, "1.0" },
+ offsetof(GlobRes, magFactor), XtRString, (XtPointer)"1.0" },
{ "fitPixmap", "FitPixmap", XtRBoolean, sizeof (Boolean),
- offsetof(GlobRes, fitPixmap), XtRString, "True" },
+ offsetof(GlobRes, fitPixmap), XtRString, (XtPointer)"True" },
{ "colorCloseness", "ColorCloseness", XtRInt, sizeof (int),
- offsetof(GlobRes, colorCloseness), XtRString, "40000" },
+ offsetof(GlobRes, colorCloseness), XtRString, (XtPointer)"40000" },
{ "gameSize", "GameSize", XtRInt, sizeof (int),
- offsetof(GlobRes, gameSize), XtRString, "0" },
+ offsetof(GlobRes, gameSize), XtRString, (XtPointer)"0" },
{ "trialMode", "TrialMode", XtRBoolean, sizeof (Boolean),
- offsetof(GlobRes, trialMode), XtRString, "False" },
+ offsetof(GlobRes, trialMode), XtRString, (XtPointer)"False" },
{ "gravityMode", "GravityMode", XtRBoolean, sizeof (Boolean),
- offsetof(GlobRes, gravityMode), XtRString, "False" },
+ offsetof(GlobRes, gravityMode), XtRString, (XtPointer)"False" },
{ "idleTime", "IdleTime", XtRInt, sizeof (int),
- offsetof(GlobRes, idleTime), XtRString, "100000" },
+ offsetof(GlobRes, idleTime), XtRString, (XtPointer)"100000" },
{ "kanjiCode", "KanjiCode", XtRString, sizeof (char *),
- offsetof(GlobRes, kanjiCode), XtRString, KANJICODE },
+ offsetof(GlobRes, kanjiCode), XtRString, (XtPointer)KANJICODE },
{ "kanjiConvert", "KanjiConvert", XtRBoolean, sizeof (Boolean),
- offsetof(GlobRes, kanjiConv), XtRString, "False" }
+ offsetof(GlobRes, kanjiConv), XtRString, (XtPointer)"False" }
};
GlobRes globRes;

View file

@ -0,0 +1,11 @@
--- body.C.orig Sun Dec 12 14:40:15 1999
+++ body.C Sun Dec 12 14:40:55 1999
@@ -224,7 +224,7 @@
int max_c;
max_c = xsize*ysize*(xsize*ysize/PKIND - 1)/2;
- p = new (Point [max_c][2]);
+ p = new Point[max_c][2];
t = new Point[xsize*ysize/PKIND];
if (hintNum == 0)

View file

@ -0,0 +1,47 @@
--- score.C.orig Sun Dec 12 14:41:24 1999
+++ score.C Sun Dec 12 14:42:58 1999
@@ -4,31 +4,31 @@
XtResource Score::resources[] = {
{ "scoreTitle", "ScoreTitle", XtRString, sizeof(char *),
- 0*sizeof(char *), XtRString, "XShisen High Score\n\n" },
+ 0*sizeof(char *), XtRString, (XtPointer)"XShisen High Score\n\n" },
{ "scoreFormat", "ScoreFormat", XtRString, sizeof(char *),
- 1*sizeof(char *), XtRString, "%2d %2.2d:%2.2d:%2.2d %-28s %s %s\n" },
+ 1*sizeof(char *), XtRString, (XtPointer)"%2d %2.2d:%2.2d:%2.2d %-28s %s %s\n" },
{ "strPeriod", "StrPeriod", XtRString, sizeof(char *),
- 2*sizeof(char *), XtRString, "Last %d days" },
+ 2*sizeof(char *), XtRString, (XtPointer)"Last %d days" },
{ "averagePeriod", "AveragePeriod", XtRString, sizeof(char *),
- 3*sizeof(char *), XtRString, "14" },
+ 3*sizeof(char *), XtRString, (XtPointer)"14" },
{ "strPlayed", "StrPlayed", XtRString, sizeof(char *),
- 4*sizeof(char *), XtRString, "Played" },
+ 4*sizeof(char *), XtRString, (XtPointer)"Played" },
{ "strCompleted", "StrCompleted", XtRString, sizeof(char *),
- 5*sizeof(char *), XtRString, "Completed" },
+ 5*sizeof(char *), XtRString, (XtPointer)"Completed" },
{ "strTedumari", "StrTedumari", XtRString, sizeof(char *),
- 6*sizeof(char *), XtRString, "Deadlocked" },
+ 6*sizeof(char *), XtRString, (XtPointer)"Deadlocked" },
{ "strSearched", "StrSearched", XtRString, sizeof(char *),
- 7*sizeof(char *), XtRString, "Seach used" },
+ 7*sizeof(char *), XtRString, (XtPointer)"Search used" },
{ "strGiveUp", "StrGiveUp", XtRString, sizeof(char *),
- 8*sizeof(char *), XtRString, "Gaven up" },
+ 8*sizeof(char *), XtRString, (XtPointer)"Given up" },
{ "strTotal", "StrTotal", XtRString, sizeof(char *),
- 9*sizeof(char *), XtRString, "Total" },
+ 9*sizeof(char *), XtRString, (XtPointer)"Total" },
{ "strAverage", "StrAverage", XtRString, sizeof(char *),
- 10*sizeof(char *), XtRString, "Whole Average" },
+ 10*sizeof(char *), XtRString, (XtPointer)"Whole Average" },
{ "strGames", "StrGames", XtRString, sizeof(char *),
- 11*sizeof(char *), XtRString, "games" },
+ 11*sizeof(char *), XtRString, (XtPointer)"games" },
{ "personalTitle", "PersonalTitle", XtRString, sizeof(char *),
- 12*sizeof(char *), XtRString, "Personal Statistics for %s" }
+ 12*sizeof(char *), XtRString, (XtPointer)"Personal Statistics for %s" }
};
void