[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Mon Jan 25 17:18:10 MST 2010
The branch, master has been updated
via e87adf5... Revert "libreplace: fix unused varibale warning on IRIX"
from 5439e1a... s3: fix detection and flags for using pthread
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e87adf523bcf7521e643bc99003d5d35242b7abf
Author: Björn Jacke <bj at sernet.de>
Date: Tue Jan 26 01:16:37 2010 +0100
Revert "libreplace: fix unused varibale warning on IRIX"
this one was broken
-----------------------------------------------------------------------
Summary of changes:
lib/replace/strptime.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/strptime.c b/lib/replace/strptime.c
index 568823f..0e40f75 100644
--- a/lib/replace/strptime.c
+++ b/lib/replace/strptime.c
@@ -251,6 +251,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
enum locale_status *decided;
int era_cnt;
{
+ const char *rp_backup;
int cnt;
size_t val;
int have_I, is_pm;
@@ -260,7 +261,6 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
int have_yday;
int have_mon, have_mday;
#ifdef _NL_CURRENT
- const char *rp_backup;
size_t num_eras;
#endif
struct era_entry *era;
@@ -297,10 +297,10 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
#ifndef _NL_CURRENT
/* We need this for handling the `E' modifier. */
start_over:
+#endif
/* Make back up of current processing pointer. */
rp_backup = rp;
-#endif
switch (*fmt++)
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list