The following commit has been merged in the openafs-devel-1_7_x branch:
commit c2bfa007ed611a2be6b4f54e314ec047a3c2453e
Author: Jeffrey Altman <[email protected]>
Date:   Sun Mar 16 15:41:45 2014 -0400

    Windows: Platform specific MIDL output
    
    Add $(CPU) to the MIDL generated _c.c and _s.c output files
    to prevent conflicts.
    
    Reviewed-on: http://gerrit.openafs.org/10907
    Reviewed-by: Jeffrey Altman <[email protected]>
    Tested-by: Jeffrey Altman <[email protected]>
    (cherry picked from commit 62f922445d3501fff4320cc7c8d93b6cd1a6361e)
    
    Change-Id: I3b4d214f9d7aae6de526450720f461e35b2351e2
    Reviewed-on: http://gerrit.openafs.org/10922
    Tested-by: BuildBot <[email protected]>
    Reviewed-by: Jeffrey Altman <[email protected]>

 src/WINNT/afsadmsvr/.gitignore  |    4 ++--
 src/WINNT/afsadmsvr/NTMakefile  |   18 ++++++++----------
 src/WINNT/afsd/.gitignore       |   12 ++++++------
 src/WINNT/afsd/NTMakefile       |   28 ++++++++++++++--------------
 src/WINNT/client_osi/.gitignore |    4 ++--
 src/WINNT/client_osi/NTMakefile |    8 ++++----
 src/auth/NTMakefile             |    2 +-
 src/libafsauthent/NTMakefile    |    2 +-
 8 files changed, 38 insertions(+), 40 deletions(-)

-- 
OpenAFS Master Repository
_______________________________________________
OpenAFS-cvs mailing list
[email protected]
https://lists.openafs.org/mailman/listinfo/openafs-cvs

Reply via email to