Commit bbe2386b authored by Yang Tse's avatar Yang Tse
Browse files

libcurl internal md5.h header file renamed to curl_md5.h

parent 2f47248e

lib/Makefile.Watcom

+2 −2
Original line number Diff line number Diff line
@@ -343,10 +343,10 @@ $(OBJ_DIR)\http_digest.obj: http_digest.c setup.h config-win32.h & 
  ..\include\curl\curlrules.h ..\include\curl\easy.h &

  ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &

  http_chunks.h hostip.h hash.h llist.h splay.h sendf.h strequal.h &

  base64.h md5.h http_digest.h strtok.h url.h memory.h easyif.h &

  base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h &

  ..\include\curl\mprintf.h memdebug.h

$(OBJ_DIR)\md5.obj: md5.c setup.h config-win32.h ..\include\curl\curlbuild.h &

  ..\include\curl\curlrules.h setup_once.h md5.h

  ..\include\curl\curlrules.h setup_once.h curl_md5.h

$(OBJ_DIR)\http_negotiate.obj: http_negotiate.c setup.h config-win32.h &

  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h

$(OBJ_DIR)\http_ntlm.obj: http_ntlm.c setup.h config-win32.h &

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \ 
  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\

  if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\

  getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h	\

  strtok.h connect.h llist.h hash.h content_encoding.h share.h md5.h	\

  http_digest.h http_negotiate.h http_ntlm.h inet_pton.h		\

  strtok.h connect.h llist.h hash.h content_encoding.h share.h		\

  curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h	\

  strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h		\

  transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h	\

  tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h	\

lib/md5.h→lib/curl_md5.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __MD5_H

#define __MD5_H

#ifndef __CURL_MD5_H

#define __CURL_MD5_H

/***************************************************************************

 *                                  _   _ ____  _     

 *  Project                     ___| | | |  _ \| |
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___ 

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

lib/http_digest.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "sendf.h"

#include "strequal.h"

#include "base64.h"

#include "md5.h"

#include "curl_md5.h"

#include "http_digest.h"

#include "strtok.h"

#include "url.h" /* for Curl_safefree() */

lib/md5.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void Decode (UINT4 *output, 
#include <string.h>

#endif



#include "md5.h"

#include "curl_md5.h"



void Curl_md5it(unsigned char *outbuffer, /* 16 bytes */

                const unsigned char *input)