generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: preprocessor complaining about macro redefinition

Browse Source
This commit is contained in:
Yang Tse
2008-05-26 01:59:00 +00:00
parent 466429efb0
commit d6f8f16068
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nss.c
View File

@@ -66,10 +66,6 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
#define SSL_DIR "/etc/pki/nssdb" #define SSL_DIR "/etc/pki/nssdb"
/* enough to fit the string "PEM Token #[0|1]" */ /* enough to fit the string "PEM Token #[0|1]" */

7
lib/security.c
View File

@@ -10,7 +10,7 @@
* Copyright (c) 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* *
* Copyright (C) 2001 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2001 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* All rights reserved. * All rights reserved.
* *
@@ -70,8 +70,6 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#define min(a, b) ((a) < (b) ? (a) : (b))
static const struct { static const struct {
enum protection_level level; enum protection_level level;
const char *name; const char *name;
@@ -179,7 +177,8 @@ sec_get_data(struct connectdata *conn,
static size_t static size_t
buffer_read(struct krb4buffer *buf, void *data, size_t len) buffer_read(struct krb4buffer *buf, void *data, size_t len)
{ {
len = min(len, buf->size - buf->index); if(buf->size - buf->index < len)
len = buf->size - buf->index;
memcpy(data, (char*)buf->data + buf->index, len); memcpy(data, (char*)buf->data + buf->index, len);
buf->index += len; buf->index += len;
return len; return len;

4
lib/ssluse.c
View File

@@ -70,10 +70,6 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
#if OPENSSL_VERSION_NUMBER >= 0x0090581fL #if OPENSSL_VERSION_NUMBER >= 0x0090581fL
#define HAVE_SSL_GET1_SESSION 1 #define HAVE_SSL_GET1_SESSION 1
#else #else