summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-10-11 01:54:48 +0200
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:42:55 +0100
commita72869d77b065c3926d56423ff1b3ec837e3ab87 (patch)
tree3cc041eba0bc2fe9eb6567668b662bcb3c887ebe
parent68c550e8e4f0ee60e42d955801f9e4dd5b4767ed (diff)
downloadsamba-a72869d77b065c3926d56423ff1b3ec837e3ab87.tar.gz
samba-a72869d77b065c3926d56423ff1b3ec837e3ab87.tar.bz2
samba-a72869d77b065c3926d56423ff1b3ec837e3ab87.zip
r25619: As perhaps could have been expected, the CFLAGS hack broke all non-gcc
compilers. Instead, as jelmer suggests, remove the depricated marker on fstring, for as long as it is used in the samba3 winbind protocol. Andrew Bartlett (This used to be commit b15df834ae6506a5c585ec1ede8bf513339d9b13)
-rw-r--r--source4/include/pstring.h2
-rw-r--r--source4/nsswitch/config.mk1
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/include/pstring.h b/source4/include/pstring.h
index aee9d75a7f..0cbc964c34 100644
--- a/source4/include/pstring.h
+++ b/source4/include/pstring.h
@@ -31,7 +31,7 @@
#define FSTRING_LEN 256
_DEPRECATED_ typedef char pstring[PSTRING_LEN];
-_DEPRECATED_ typedef char fstring[FSTRING_LEN];
+typedef char fstring[FSTRING_LEN];
#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1)
#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1)
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 481841cb9e..8982024516 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -4,7 +4,6 @@ SO_VERSION = 0
DESCRIPTION = Client library for communicating with winbind
OBJ_FILES = wb_common.o
PRIVATE_DEPENDENCIES = SOCKET_WRAPPER
-CFLAGS = -Wno-deprecated-declarations
#################################
# Start BINARY nsstest