summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-01 12:37:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:02 -0500
commit0bb1c2da0e4164b448c6b7cc988f59b59225802c (patch)
treecf6aa875aafa9b60550c2e929773f3cc49b1b05e /source4/lib/ldb
parentbb71578696ad87e2848a7d05aac5c284f760a187 (diff)
downloadsamba-0bb1c2da0e4164b448c6b7cc988f59b59225802c.tar.gz
samba-0bb1c2da0e4164b448c6b7cc988f59b59225802c.tar.bz2
samba-0bb1c2da0e4164b448c6b7cc988f59b59225802c.zip
r17992: reverted r17842
This needs more consideration, as the patch removed the copyright notice and license from the timegm.c code. Volker, when you get a minute can you let me know what problem this patch fixed so I can find a different approach? (This used to be commit 5b9b9dd5303300778bb9e6d0479ab03fdd70c67d)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/replace/replace.c2
-rw-r--r--source4/lib/ldb/replace/timegm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/replace/replace.c b/source4/lib/ldb/replace/replace.c
index a63613fc10..faa5771a76 100644
--- a/source4/lib/ldb/replace/replace.c
+++ b/source4/lib/ldb/replace/replace.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "ldb/include/includes.h"
-#if !defined(HAVE_STRNLEN) && !defined(_SAMBA_BUILD_)
+#ifndef HAVE_STRNLEN
/**
Some platforms don't have strnlen
**/
diff --git a/source4/lib/ldb/replace/timegm.c b/source4/lib/ldb/replace/timegm.c
index 10631befd9..5fb15475f3 100644
--- a/source4/lib/ldb/replace/timegm.c
+++ b/source4/lib/ldb/replace/timegm.c
@@ -38,7 +38,7 @@
#include "includes.h"
#include "ldb/include/includes.h"
-#if !defined(HAVE_TIMEGM) && !defined(_SAMBA_BUILD_)
+#ifndef HAVE_TIMEGM
static int is_leap(unsigned y)
{