Avoid conflict with C++11's std::move.

13 files changed, 334 insertions, 34 deletions

diff --git a/games/exchess/distinfo b/games/exchess/distinfo
index 8ac051c3994..1692af04e85 100644
--- a/games/exchess/distinfo
+++ b/games/exchess/distinfo
@@ -1,18 +1,22 @@
-$NetBSD: distinfo,v 1.8 2012/01/20 17:07:35 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/04/30 22:20:58 joerg Exp $
 
 SHA1 (EXCH314S.zip) = 7d8ffbd94dc86a97512826e611048a691c8c646d
 RMD160 (EXCH314S.zip) = 0503200c210aaf7ddc69e1372392e8ea690505ea
 Size (EXCH314S.zip) = 110676 bytes
-SHA1 (patch-aa) = 43731240e32aaab2c7c32aac343ef31f5a220b5a
-SHA1 (patch-ab) = a9385051ed9d482e02bbeff40b5d9552ebc56c9f
+SHA1 (patch-aa) = 6aa16f2ca4ecc52b77739b5d28ab650f8102e54c
+SHA1 (patch-ab) = a38d6455675083e9ca291c844c85746a0ed897e5
 SHA1 (patch-ac) = cfc1beff8ae3b2e4c9620e8d49852ce80d848ad6
-SHA1 (patch-ad) = 6aa7b8eff073d68899fbd026bd16d92c0ddf1d82
+SHA1 (patch-ad) = 6deeaae3dbaf84f7763306d06117e21aa3dcf885
 SHA1 (patch-ae) = 9d374b888a6f431604f41c4421baa23d8ca775a1
-SHA1 (patch-af) = 7eb0c780dea41b5d17a532f82a76b984eeefda2d
-SHA1 (patch-ag) = 00bb9750c823aecd7fa44aacc1cf539e062055a9
+SHA1 (patch-af) = f2379b8929775ff660f9af9fc96969eab1b25870
+SHA1 (patch-ag) = 7072e6b7ac08fcb901630c2705fe38065bc89bab
 SHA1 (patch-ah) = 872b0b7c62f95075f0ce7360464fa51215619ee3
-SHA1 (patch-ai) = 0f8a0182460982181a8bd9d802759f6f24067a79
-SHA1 (patch-aj) = b769f2f063794a323136ff75d6219d6f6f98600e
+SHA1 (patch-ai) = 7244cfeb214e08a5e10198de2488957a63e8fda9
+SHA1 (patch-aj) = 064dd97be969d403f09cb9cab70705891b1355de
 SHA1 (patch-ak) = 659f1cf07efefe524be4d025446fea55eb5f3e9a
-SHA1 (patch-parse.cpp) = b3eab9785fb3be104ba8258259bcf2254c695194
+SHA1 (patch-funct.h) = 8ff861d1cfaac5aac8722334b2142e9c63a231c6
+SHA1 (patch-main.h) = f49c0c889469002281fd15c6ceac359f8c4e6f51
+SHA1 (patch-parse.cpp) = f000ea0d4e2adb893ec6ec09a5e0c3dc5c77970d
+SHA1 (patch-pmoves.cpp) = 66973c0baee54fa623a9f0b77c29d41e4c6924b8
+SHA1 (patch-search.h) = 85b16b102087dd218d64c14cc294c5c6df6849bb
 SHA1 (patch-setup.cpp) = 16914d19bb6bc48341409dfa15d9f451e4f46733
diff --git a/games/exchess/patches/patch-aa b/games/exchess/patches/patch-aa
index 78321e9102d..4262bf8555e 100644
--- a/games/exchess/patches/patch-aa
+++ b/games/exchess/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2011/11/25 21:52:33 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2013/04/30 22:20:58 joerg Exp $
 
 --- book.cpp.orig	2000-04-30 09:56:26.000000000 +0000
 +++ book.cpp
@@ -20,16 +20,23 @@ $NetBSD: patch-aa,v 1.2 2011/11/25 21:52:33 joerg Exp $
  /* variables for book learning */
  book_rec learn_book[100];          // book learning array
  int learn_count = 0;               // number of book moves played
-@@ -52,7 +54,7 @@ void build_book(position ipos)
+@@ -51,8 +53,8 @@ void build_book(position ipos)
+   char instring[100], line[100];     // strings from input files
    char outbook[100];
    position temp_pos;                 // temporary position
-   move bmove;                        // book move under consideration
+-  move bmove;                        // book move under consideration
 -  unsigned __int64 pcode;            // hash code for position
++  my_move bmove;                        // book move under consideration
 +  u_int64_t pcode;                   // hash code for position
    int i = -1, j = 0, k = 0, p;       // loop variables
    int count = 0, thresh, LINE_DEPTH; // control variables
  
-@@ -245,7 +247,7 @@ int find_record(position p, move m, int 
+@@ -241,11 +243,11 @@ book_rec book_record;    // working reco
+ position temporary_pos;  // working position
+ 
+ /* Function to find a position in the book */
+-int find_record(position p, move m, int file_size)
++int find_record(position p, my_move m, int file_size)
  {
    file_pos = 0;
    int jump = int(file_size/2);
@@ -38,3 +45,37 @@ $NetBSD: patch-aa,v 1.2 2011/11/25 21:52:33 joerg Exp $
  
    temporary_pos = p;
    if(!exec_move(&temporary_pos, m, 1)) return 0;
+@@ -299,13 +301,13 @@ int find_record(position p, move m, int 
+ // position is in the book.  If so, the move in question
+ // becomes a candidate move.  Information is stored to
+ // facilitate easy learning during the game.
+-move opening_book(h_code hash_code, position p)
++my_move opening_book(h_code hash_code, position p)
+ {
+   int file_size, mflag = 0, j;
+   int candidates = 0, total_score = 0;
+   int logger = 0, poster = 0;
+   move_list list;
+-  move nomove; nomove.t = 0;
++  my_move nomove; nomove.t = 0;
+   char book_file[100];   // file name for the book
+ 
+   // generate legal moves
+@@ -398,7 +400,7 @@ int edit_book(h_code hash_code, position
+   int file_size, mflag = 0, j, outflag = 0;
+   int search_time = 0, total_score = 0;
+   move_list list;
+-  move nomove; nomove.t = 0;
++  my_move nomove; nomove.t = 0;
+   char resp[2];
+   char book_file[100];   // file name for the book
+ 
+@@ -462,7 +464,7 @@ int edit_book(h_code hash_code, position
+   if(outflag == 1) cout << "\n";
+ 
+   /* Edit mode for individual moves */
+-  move edit_move;
++  my_move edit_move;
+   while(1) {
+     cout << "\nEnter a move to be edited/investigated (0 = quit): ";
+     cin >> mstring; if(mstring[0] == '0') break;
diff --git a/games/exchess/patches/patch-ab b/games/exchess/patches/patch-ab
index 7f4f288d991..67096709c21 100644
--- a/games/exchess/patches/patch-ab
+++ b/games/exchess/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2002/07/16 13:39:03 agc Exp $
+$NetBSD: patch-ab,v 1.3 2013/04/30 22:20:58 joerg Exp $
 
---- chess.h.orig	Sat Feb 19 11:28:46 2000
-+++ chess.h	Tue Jul 16 14:37:30 2002
+--- chess.h.orig	2000-02-19 11:28:46.000000000 +0000
++++ chess.h
 @@ -3,6 +3,8 @@
  #ifndef CHESS_H
  #define CHESS_H
@@ -11,7 +11,33 @@ $NetBSD: patch-ab,v 1.2 2002/07/16 13:39:03 agc Exp $
  // move structure to encapsulate several important move parameters
  // note: The char used below is treated like an integer.
  
-@@ -86,7 +88,7 @@
+@@ -30,7 +32,7 @@ struct move_t {
+ // union of move_t and an integer to make comparison of 
+ // moves easier.  (as suggested in Tom Kerrigans simple chess program)
+ 
+-union move {
++union my_move {
+   move_t b;
+   int t;           // assuming a 32 bit integer
+ };
+@@ -38,7 +40,7 @@ union move {
+ // Add a score for sorting purposes to the move record
+ 
+ struct move_rec {
+-  move m;
++  my_move m;
+   int score; 
+ };
+ 
+@@ -79,14 +81,14 @@ struct position {
+                              // side to move
+   int extend;                // extension flag
+   char plist[2][7][10];      // piece lists
+-  move last;                 // last move made
++  my_move last;              // last move made
+   h_code hcode;              // hash code
+ };
+ 
  // Structure for position in the opening book
  
  struct book_rec {
diff --git a/games/exchess/patches/patch-ad b/games/exchess/patches/patch-ad
index a689208052e..54c25e2977c 100644
--- a/games/exchess/patches/patch-ad
+++ b/games/exchess/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2012/01/20 17:07:35 joerg Exp $
+$NetBSD: patch-ad,v 1.5 2013/04/30 22:20:58 joerg Exp $
 
 --- main.cpp.orig	2000-04-01 07:46:20.000000000 +0000
 +++ main.cpp
@@ -29,7 +29,15 @@ $NetBSD: patch-ad,v 1.4 2012/01/20 17:07:35 joerg Exp $
  #else
   #include <windows.h>
   #include <time.h>
-@@ -49,14 +52,14 @@ ofstream logfile;
+@@ -42,21 +45,21 @@ int omttc = 0, mttc = 0, inc = 0; float 
+ int display_board = 0;
+ int analysis_mode = 0;
+ extern int fail;   // flag for fail high/fail low from search
+-extern move ponder_move;
++extern my_move ponder_move;
+ extern int logging;
+ 
+ ofstream logfile;
  int MAX_LOGS = 100;
  
  // xboard flag
@@ -46,7 +54,13 @@ $NetBSD: patch-ad,v 1.4 2012/01/20 17:07:35 joerg Exp $
  char exec_path[100];
  
  // performance function
-@@ -93,16 +96,7 @@ int main(int argc, char *argv[])
+@@ -88,21 +91,12 @@ ofstream printer;
+ int main(int argc, char *argv[])
+ {
+   char mstring[10];
+-  move hint;
++  my_move hint;
+   xboard = 0; ponder = 0; ics = 0;
    learn_count = 0; learned = 0; learn_bk = 1; shout_book = 0;
  
  
@@ -91,3 +105,12 @@ $NetBSD: patch-ad,v 1.4 2012/01/20 17:07:35 joerg Exp $
    else if(!strcmp(response, "performance")) { performance(); }
    else if(!strcmp(response, "setboard"))
     { cin >> inboard >> ms >> castle >> ep; mttc = omttc; game_over = 0;
+@@ -795,7 +789,7 @@ void performance()
+ // when the best move was first found and held on to.
+ 
+ float soltime;
+-int bmcount, tsuite = 0; move bmoves[10];
++int bmcount, tsuite = 0; my_move bmoves[10];
+ int best_depth, best_score;
+ extern int stage;
+ unsigned long nodes, nodes1, test_time, test_time1;
diff --git a/games/exchess/patches/patch-af b/games/exchess/patches/patch-af
index 1ee862ab31f..22aa8261130 100644
--- a/games/exchess/patches/patch-af
+++ b/games/exchess/patches/patch-af
@@ -1,8 +1,27 @@
-$NetBSD: patch-af,v 1.1 2004/02/14 04:31:56 kristerw Exp $
+$NetBSD: patch-af,v 1.2 2013/04/30 22:20:58 joerg Exp $
 
---- hash.h.orig	Sat Feb 14 04:16:19 2004
-+++ hash.h	Sat Feb 14 04:16:36 2004
-@@ -54,6 +54,6 @@
+--- hash.h.orig	2000-02-25 18:31:36.000000000 +0000
++++ hash.h
+@@ -17,7 +17,7 @@ struct hash_rec
+   short score;
+   char flag;
+   unsigned char depth;
+-  move hmove;
++  my_move hmove;
+   unsigned char id;
+   unsigned char mate_ext;
+ };
+@@ -46,14 +46,14 @@ struct pawn_rec
+ void open_hash();
+ void close_hash();
+ void set_hash_size(int Mbytes);
+-void put_hash(h_code h_key, int score, int alpha, int beta, int depth, move hmove, int mate_ext);
+-int get_hash(h_code h_key, int alpha, int beta, int depth, int *mate_ext, int *null_hash, move *gmove);
++void put_hash(h_code h_key, int score, int alpha, int beta, int depth, my_move hmove, int mate_ext);
++int get_hash(h_code h_key, int alpha, int beta, int depth, int *mate_ext, int *null_hash, my_move *gmove);
+ int get_move(h_code h_key);
+ h_code gen_code(position *p);
+ void start_code();
  float ran(long *idum);
  
  /* Macro for or'ing two hash codes */
diff --git a/games/exchess/patches/patch-ag b/games/exchess/patches/patch-ag
index 5a84edd84b9..505c0ed7e5e 100644
--- a/games/exchess/patches/patch-ag
+++ b/games/exchess/patches/patch-ag
@@ -1,8 +1,26 @@
-$NetBSD: patch-ag,v 1.1 2004/02/14 04:31:56 kristerw Exp $
+$NetBSD: patch-ag,v 1.2 2013/04/30 22:20:58 joerg Exp $
 
---- hash.cpp.orig	Sat Feb 14 04:23:02 2004
-+++ hash.cpp	Sat Feb 14 04:24:05 2004
-@@ -210,7 +210,7 @@
+--- hash.cpp.orig	2000-04-01 07:46:34.000000000 +0000
++++ hash.cpp
+@@ -67,7 +67,7 @@ void close_hash()
+ 
+ /* function to stuff a hash entry into the hash table */
+ void put_hash(h_code h_key, int score, int alpha, int beta,
+-                            int depth, move hmove, int mate_ext)
++                            int depth, my_move hmove, int mate_ext)
+ {
+  hash_rec *h, *r; int flag; 
+ 
+@@ -127,7 +127,7 @@ void put_hash(h_code h_key, int score, i
+ }
+ 
+ /* function to find and return a hash entry */
+-int get_hash(h_code h_key, int alpha, int beta, int depth, int *mate_ext, int *null_hash, move *gmove)
++int get_hash(h_code h_key, int alpha, int beta, int depth, int *mate_ext, int *null_hash, my_move *gmove)
+ {
+  hash_rec *h; int hscore;
+ 
+@@ -210,7 +210,7 @@ h_code gen_code(position *p)
    }
  
    for(i = 0; i < 64; i++) {
@@ -11,7 +29,7 @@ $NetBSD: patch-ag,v 1.1 2004/02/14 04:31:56 kristerw Exp $
     if(p->sq[i].side == p->wtm) p->material += value[p->sq[i].type];
     else p->material -= value[p->sq[i].type];
     if(p->sq[i].type > PAWN) p->pieces[p->sq[i].side]++;
-@@ -220,11 +220,11 @@
+@@ -220,11 +220,11 @@ h_code gen_code(position *p)
     } 
    }
  
diff --git a/games/exchess/patches/patch-ai b/games/exchess/patches/patch-ai
index bffa3fc9440..62c045e25b7 100644
--- a/games/exchess/patches/patch-ai
+++ b/games/exchess/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2011/11/25 21:52:33 joerg Exp $
+$NetBSD: patch-ai,v 1.3 2013/04/30 22:20:58 joerg Exp $
 
 --- exmove.cpp.orig	2000-04-01 07:46:42.000000000 +0000
 +++ exmove.cpp
@@ -11,6 +11,15 @@ $NetBSD: patch-ai,v 1.2 2011/11/25 21:52:33 joerg Exp $
  
  /* Hash code variables */
  extern hash_rec *hash_table;    // pointer to hash_table
+@@ -37,7 +37,7 @@ inline int simple_check(position *p, int
+ // If the move is legal, the function returns a 1, otherwise 0.
+ // Note that the move is made, regardless - so proper precautions
+ // need to be taken, if the move might need to be undone
+-int exec_move(position *p, move emove, int ply)
++int exec_move(position *p, my_move emove, int ply)
+ {
+   register int pi;
+   // if this is a castle, check that it is legal then
 @@ -52,8 +52,8 @@ int exec_move(position *p, move emove, i
                  { return 0; }
                p->sq[5] = p->sq[7];
@@ -137,3 +146,12 @@ $NetBSD: patch-ai,v 1.2 2011/11/25 21:52:33 joerg Exp $
  
    // check whether other side is placed in check
    int ptype = p->sq[emove.b.to].type; 
+@@ -270,7 +270,7 @@ int exec_move(position *p, move emove, i
+ 
+ // Function to make the move in the q-search
+ //  - much simpler
+-int qexec_move(position *p, move emove, int ply)
++int qexec_move(position *p, my_move emove, int ply)
+ {
+   register int pi;
+ 
diff --git a/games/exchess/patches/patch-aj b/games/exchess/patches/patch-aj
index 1090aaee21b..d2863f04c22 100644
--- a/games/exchess/patches/patch-aj
+++ b/games/exchess/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2011/11/25 21:52:33 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2013/04/30 22:20:58 joerg Exp $
 
 --- search.cpp.orig	2000-04-30 09:56:56.000000000 +0000
 +++ search.cpp
@@ -23,6 +23,15 @@ $NetBSD: patch-aj,v 1.2 2011/11/25 21:52:33 joerg Exp $
  #include "define.h"
  #include "chess.h"
  #include "const.h"
+@@ -24,7 +27,7 @@
+ /*----------------------- Search function ---------------------*/
+ // Driver for the search process.  1st initialize important data
+ // structures, the do iterative deeping until time runs out.
+-move search(position p, int time_limit, int T)
++my_move search(position p, int time_limit, int T)
+ {
+   char outstring[60], mstring[10];
+   int g, done, pvi;
 @@ -181,7 +184,7 @@ move search(position p, int time_limit, 
    last_depth = 1;
  
@@ -41,6 +50,24 @@ $NetBSD: patch-aj,v 1.2 2011/11/25 21:52:33 joerg Exp $
  
    if(!xboard && !ALLEG && post) {
     cout << "\nnode_count = " << node_count
+@@ -351,7 +354,7 @@ move search(position p, int time_limit, 
+ // It is updated by doing a mem-copy of the principle continuation
+ // found at deeper depths to this depth + the move at this depth
+ // is stuffed in first.
+-inline void pc_update(move pcmove, int ply)
++inline void pc_update(my_move pcmove, int ply)
+ {
+  int pci;
+  pc[ply][ply].t = pcmove.t;
+@@ -395,7 +398,7 @@ int pvs(int alpha, int beta, int depth, 
+  int score, old_depth = depth, mate_ext = 0;
+  int mcount = 0, first = 1, razor = 0;
+  int razor_margin, total_pieces;
+- move smove, gmove, bmove = nomove;
++ my_move smove, gmove, bmove = nomove;
+ 
+ #if DEBUG
+ // Debug archiving of search to a file
 @@ -423,7 +426,7 @@ outfile << space_string << "->Ply: " << 
   if(ply) {
    // add hash code for this position to position list
diff --git a/games/exchess/patches/patch-funct.h b/games/exchess/patches/patch-funct.h
new file mode 100644
index 00000000000..23b0ad55803
--- /dev/null
+++ b/games/exchess/patches/patch-funct.h
@@ -0,0 +1,36 @@
+$NetBSD: patch-funct.h,v 1.1 2013/04/30 22:20:58 joerg Exp $
+
+--- funct.h.orig	2013-04-30 20:06:16.000000000 +0000
++++ funct.h
+@@ -22,23 +22,23 @@ void log_search(int score, long start_ti
+ void setboard(char inboard[60], char ms, char castle[4], char ep[2]);    // setup the board
+ 
+ /* parse.cpp */
+-void print_move(position p, move pmove, char mstring[10]); // print a given move
+-move parse_move(position p, char mstring[10]);
++void print_move(position p, my_move pmove, char mstring[10]); // print a given move
++my_move parse_move(position p, char mstring[10]);
+ 
+ /* open.cpp */
+-move opening_book(h_code hash_code, position p);
++my_move opening_book(h_code hash_code, position p);
+ 
+ /* search.cpp */
+-move search(position p, int time_limit, int T);
+-void pc_update(move pcmove, int ply);
++my_move search(position p, int time_limit, int T);
++void pc_update(my_move pcmove, int ply);
+ int pvs(int alpha, int beta, int depth, int ply);
+ int qsearch(int ply, int alpha, int beta);
+ 
+ /* emove.cpp */
+-int exec_move(position *p, move emove, int ply);
+-int qexec_move(position *p, move emove, int ply);
++int exec_move(position *p, my_move emove, int ply);
++int qexec_move(position *p, my_move emove, int ply);
+ void gen_check_table();
+-// int undo_move(position *p, move emove, int ply);
++// int undo_move(position *p, my_move emove, int ply);
+ 
+ /* movelist.cpp */
+ void legalmoves(position *p, move_list *list);
diff --git a/games/exchess/patches/patch-main.h b/games/exchess/patches/patch-main.h
new file mode 100644
index 00000000000..272f0f92343
--- /dev/null
+++ b/games/exchess/patches/patch-main.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-main.h,v 1.1 2013/04/30 22:20:58 joerg Exp $
+
+--- main.h.orig	2013-04-30 20:07:34.000000000 +0000
++++ main.h
+@@ -16,7 +16,7 @@ position last_pos;                      
+ 
+ 
+ 
+-move game_history[600];                 // game move history
++my_move game_history[600];                 // game move history
+ 
+ h_code p_list[600];                     // game position list
+ 
+@@ -36,9 +36,9 @@ int both = 0;                           
+ 
+ 
+ 
+-move best;                              // best move - will be made
++my_move best;                              // best move - will be made
+ 
+-extern move pc[MAXD+1][MAXD+1];         // principle continuation
++extern my_move pc[MAXD+1][MAXD+1];         // principle continuation
+ 
+ 
+ 
diff --git a/games/exchess/patches/patch-parse.cpp b/games/exchess/patches/patch-parse.cpp
index 9e36c02afb5..9067011afa3 100644
--- a/games/exchess/patches/patch-parse.cpp
+++ b/games/exchess/patches/patch-parse.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-parse.cpp,v 1.1 2011/11/25 21:52:33 joerg Exp $
+$NetBSD: patch-parse.cpp,v 1.2 2013/04/30 22:20:58 joerg Exp $
 
---- parse.cpp.orig	2011-11-25 17:25:09.000000000 +0000
+--- parse.cpp.orig	2000-04-01 07:46:06.000000000 +0000
 +++ parse.cpp
-@@ -7,7 +7,7 @@
+@@ -7,18 +7,18 @@
  #include "chess.h"
  #include "funct.h"
  #include "const.h"
@@ -11,3 +11,25 @@ $NetBSD: patch-parse.cpp,v 1.1 2011/11/25 21:52:33 joerg Exp $
  #include <stdio.h>
  #include <string.h>
  
+ extern int ics;
+ // Function to parse a move from the human player
+ // This move is checked then checked to see if it is legal
+-move parse_move(position p, char mstring[10])
++my_move parse_move(position p, char mstring[10])
+ {
+   int legal = 0, piece, to_sq = -1, from_sq = -1, promote = QUEEN;
+   int from_file = -1, from_row = -1, match_count = 0;
+-  move play, mplay[4], nomove; nomove.t = 0;
++  my_move play, mplay[4], nomove; nomove.t = 0;
+   mplay[0].t = 0; mplay[1].t = 0; mplay[2].t = 0; mplay[3].t = 0;
+   position t_pos;
+   move_list list;
+@@ -175,7 +175,7 @@ move parse_move(position p, char mstring
+ // to a string in long algebraic format
+ // This function works by simply adding the appropriate
+ // characters to the move string;
+-void print_move(position p, move pmove, char mstring[10])
++void print_move(position p, my_move pmove, char mstring[10])
+ {
+   char dummy[10];             // dummy character string
+   int ptype, pfrom, pto, ppiece;
diff --git a/games/exchess/patches/patch-pmoves.cpp b/games/exchess/patches/patch-pmoves.cpp
new file mode 100644
index 00000000000..5949dcee6eb
--- /dev/null
+++ b/games/exchess/patches/patch-pmoves.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-pmoves.cpp,v 1.1 2013/04/30 22:20:58 joerg Exp $
+
+--- pmoves.cpp.orig	2013-04-30 20:06:41.000000000 +0000
++++ pmoves.cpp
+@@ -10,7 +10,7 @@
+ 
+ extern unsigned int history[64][64];           // history table
+ extern int killer1[2], killer2[2], killer3[2];
+-extern move hmove;                              // hash move
++extern my_move hmove;                              // hash move
+ extern int taxi_cab[64][64];
+ extern int stage;
+ extern int check_table[64][64], knight_check_table[64][64];
diff --git a/games/exchess/patches/patch-search.h b/games/exchess/patches/patch-search.h
new file mode 100644
index 00000000000..4c5bb6bbf56
--- /dev/null
+++ b/games/exchess/patches/patch-search.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-search.h,v 1.1 2013/04/30 22:20:58 joerg Exp $
+
+--- search.h.orig	2013-04-30 20:07:06.000000000 +0000
++++ search.h
+@@ -25,7 +25,7 @@ int RAZOR_DEPTH = 192;
+ position sp[MAXD];                  // array of search positions
+ 
+ move_list slist[MAXD+1];            // array of search lists
+-move pc[MAXD+1][MAXD+1];            // triangular array for search
++my_move pc[MAXD+1][MAXD+1];            // triangular array for search
+                                     // principle continuation
+ 
+ int max_ply;                        // max ply of current search
+@@ -51,10 +51,10 @@ int g_last;                         // l
+ 
+ int killer1[2], killer2[2], killer3[2]; // killer moves
+ 
+-move nomove;                        // move for initization purposes   
+-move hmove;                         // move from hash table
+-move bookm;                         // move from opening book
+-move ponder_move;                   // move we are pondering
++my_move nomove;                        // move for initization purposes   
++my_move hmove;                         // move from hash table
++my_move bookm;                         // move from opening book
++my_move ponder_move;                   // move we are pondering
+ 
+ unsigned int history[64][64];      // table for history scores
+