mirror of
https://github.com/dashr9230/SA-MP.git
synced 2024-11-23 06:20:22 +00:00
[saco] Rename sha1.cpp/.h to fhicl-sha1.cpp/.h
Due to a object file conflict with RakNet's SHA1
This commit is contained in:
parent
27fecef578
commit
1f16817ef0
@ -1,12 +1,12 @@
|
||||
/*
|
||||
* sha1.cpp
|
||||
* fhicl-sha1.cpp
|
||||
*
|
||||
* Copyright (C) 1998, 2009
|
||||
* Paul E. Jones <paulej@packetizer.com>
|
||||
* All Rights Reserved.
|
||||
*
|
||||
*****************************************************************************
|
||||
* $Id: sha1.cpp 12 2009-06-22 19:34:25Z paulej $
|
||||
* $Id: fhicl-sha1.cpp 12 2009-06-22 19:34:25Z paulej $
|
||||
*****************************************************************************
|
||||
*
|
||||
* Description:
|
||||
@ -37,7 +37,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "sha1.h"
|
||||
#include "fhicl-sha1.h"
|
||||
|
||||
namespace fhicl {
|
||||
|
@ -1,12 +1,12 @@
|
||||
/*
|
||||
* sha1.h
|
||||
* fhicl-sha1.h
|
||||
*
|
||||
* Copyright (C) 1998, 2009
|
||||
* Paul E. Jones <paulej@packetizer.com>
|
||||
* All Rights Reserved.
|
||||
*
|
||||
*****************************************************************************
|
||||
* $Id: sha1.h 12 2009-06-22 19:34:25Z paulej $
|
||||
* $Id: fhicl-sha1.h 12 2009-06-22 19:34:25Z paulej $
|
||||
*****************************************************************************
|
||||
*
|
||||
* Description:
|
||||
@ -17,7 +17,7 @@
|
||||
* character names, were used because those were the names used
|
||||
* in the publication.
|
||||
*
|
||||
* Please read the file sha1.cpp for more information.
|
||||
* Please read the file fhicl-sha1.cpp for more information.
|
||||
*
|
||||
*/
|
||||
|
@ -429,6 +429,12 @@
|
||||
<File
|
||||
RelativePath=".\exceptions.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\fhicl-sha1.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\fhicl-sha1.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\filesystem.cpp">
|
||||
</File>
|
||||
@ -477,12 +483,6 @@
|
||||
<File
|
||||
RelativePath=".\saco.rc">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sha1.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sha1.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\subclass.cpp">
|
||||
</File>
|
||||
|
Loading…
Reference in New Issue
Block a user