use FILE_MACRO instead of __FILE__

use FUNCTION_MACRO instead of __FUNCTION_
(This used to be commit 243763d6eb107ab2444d81025232c8fe795baaf1)

7 files changed, 60 insertions, 60 deletions

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 71d4bac795..4926026061 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -69,7 +69,7 @@
 /* assert macros */
 #define SMB_ASSERT(b) ((b)?(void)0: \
         (DEBUG(0,("PANIC: assert failed at %s(%d)\n", \
-		 __FILE__, __LINE__)), smb_panic("assert failed")))
+		 FILE_MACRO, __LINE__)), smb_panic("assert failed")))
 #define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n))
 
 /* these are useful macros for checking validity of handles */
@@ -156,17 +156,17 @@
 #define HAS_CACHED_ERROR(fsp) ((fsp)->wbmpx_ptr && \
                 (fsp)->wbmpx_ptr->wr_discard)
 /* Macro to turn the cached error into an error packet */
-#define CACHED_ERROR(fsp) cached_error_packet(outbuf,fsp,__LINE__,__FILE__)
+#define CACHED_ERROR(fsp) cached_error_packet(outbuf,fsp,__LINE__,FILE_MACRO)
 
 /* these are the datagram types */
 #define DGRAM_DIRECT_UNIQUE 0x10
 
-#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,__FILE__)
-#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,__FILE__)
-#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,__FILE__)
+#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,FILE_MACRO)
+#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,FILE_MACRO)
+#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,FILE_MACRO)
 
 /* this is how errors are generated */
-#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__)
+#define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,FILE_MACRO)
 
 #define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x))
 
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 2427075180..884db4c26c 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -527,7 +527,7 @@ static int ldapsam_search(struct ldapsam_privates *ldap_state,
 	}
 	
 	if (rc == LDAP_SERVER_DOWN) {
-		DEBUG(0,("%s: LDAP server is down!\n",__FUNCTION__));
+		DEBUG(0,("%s: LDAP server is down!\n",FUNCTION_MACRO));
 		ldapsam_close(ldap_state);	
 	}
 	
@@ -551,7 +551,7 @@ static int ldapsam_modify(struct ldapsam_privates *ldap_state, char *dn, LDAPMod
 	}
 	
 	if (rc == LDAP_SERVER_DOWN) {
-		DEBUG(0,("%s: LDAP server is down!\n",__FUNCTION__));
+		DEBUG(0,("%s: LDAP server is down!\n",FUNCTION_MACRO));
 		ldapsam_close(ldap_state);	
 	}
 	
@@ -575,7 +575,7 @@ static int ldapsam_add(struct ldapsam_privates *ldap_state, const char *dn, LDAP
 	}
 	
 	if (rc == LDAP_SERVER_DOWN) {
-		DEBUG(0,("%s: LDAP server is down!\n",__FUNCTION__));
+		DEBUG(0,("%s: LDAP server is down!\n",FUNCTION_MACRO));
 		ldapsam_close(ldap_state);	
 	}
 		
@@ -599,7 +599,7 @@ static int ldapsam_delete(struct ldapsam_privates *ldap_state, char *dn)
 	}
 	
 	if (rc == LDAP_SERVER_DOWN) {
-		DEBUG(0,("%s: LDAP server is down!\n",__FUNCTION__));
+		DEBUG(0,("%s: LDAP server is down!\n",FUNCTION_MACRO));
 		ldapsam_close(ldap_state);	
 	}
 		
@@ -623,7 +623,7 @@ static int ldapsam_extended_operation(struct ldapsam_privates *ldap_state, LDAP_
 	}
 	
 	if (rc == LDAP_SERVER_DOWN) {
-		DEBUG(0,("%s: LDAP server is down!\n",__FUNCTION__));
+		DEBUG(0,("%s: LDAP server is down!\n",FUNCTION_MACRO));
 		ldapsam_close(ldap_state);	
 	}
 		
diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c
index d70937e8e0..8e294c7637 100644
--- a/source3/python/py_tdbpack.c
+++ b/source3/python/py_tdbpack.c
@@ -247,7 +247,7 @@ pytdbpack_data(const char *format_str,
 		default:
 			PyErr_Format(PyExc_ValueError,
 				     "%s: format character '%c' is not supported",
-				     __FUNCTION__, ch);
+				     FUNCTION_MACRO, ch);
 			return NULL;
 		}
 	}
@@ -477,7 +477,7 @@ pytdbunpack(PyObject *self,
 		if (i == 0) {
 			PyErr_Format(PyExc_ValueError,
 				     "%s: '$' may not be first character in format",
-				     __FUNCTION__);
+				     FUNCTION_MACRO);
 			return NULL;
 		} 
 		while (packed_len > 0)
@@ -511,7 +511,7 @@ static void
 pytdbunpack_err_too_short(void)
 {
 	PyErr_Format(PyExc_IndexError,
-		     __FUNCTION__ ": data too short for unpack format");
+		     FUNCTION_MACRO ": data too short for unpack format");
 }
 
 
@@ -598,7 +598,7 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list)
 
 	if (slen < 0) { /* surely you jest */
 		PyErr_Format(PyExc_ValueError,
-			     __FUNCTION__ ": buffer seems to have negative length");
+			     FUNCTION_MACRO ": buffer seems to have negative length");
 		return NULL;
 	}
 
@@ -608,7 +608,7 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list)
 
 	if (*plen < slen) {
 		PyErr_Format(PyExc_IndexError,
-			     __FUNCTION__ ": not enough data to unpack buffer: "
+			     FUNCTION_MACRO ": not enough data to unpack buffer: "
 			     "need %d bytes, have %d",
 			     (int) slen, *plen);
 		return NULL;
@@ -668,7 +668,7 @@ static PyObject *pytdbunpack_item(char ch,
 	}
 	else {
 		PyErr_Format(PyExc_ValueError,
-			     __FUNCTION__ ": format character '%c' is not supported",
+			     FUNCTION_MACRO ": format character '%c' is not supported",
 			     ch);
 		
 		return NULL;
diff --git a/source3/sam/interface.c b/source3/sam/interface.c
index d08df42122..6010bc6837 100644
--- a/source3/sam/interface.c
+++ b/source3/sam/interface.c
@@ -170,7 +170,7 @@ static NTSTATUS make_backend_entry(SAM_BACKEND_ENTRY *backend_entry, char *sam_b
 	if (!secrets_fetch_domain_sid(backend_entry->domain_name, backend_entry->domain_sid)) {
 		DEBUG(2,("make_backend_entry: There is no SID stored for domain %s. Creating a new one.\n",
 			backend_entry->domain_name));		
-		DEBUG(0, ("FIXME in %s:%d\n", __FILE__, __LINE__));
+		DEBUG(0, ("FIXME in %s:%d\n", FILE_MACRO, __LINE__));
 		ZERO_STRUCTP(backend_entry->domain_sid);
 	}
 	
diff --git a/source3/sam/sam_ads.c b/source3/sam/sam_ads.c
index 6cb205d338..d2bfab53b9 100755
--- a/source3/sam/sam_ads.c
+++ b/source3/sam/sam_ads.c
@@ -622,7 +622,7 @@ static NTSTATUS sam_ads_set_sec_desc(const SAM_METHODS *sam_method, const NT_USE
 			      const DOM_SID *sid, const SEC_DESC *sd)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -677,7 +677,7 @@ static NTSTATUS sam_ads_lookup_name(const SAM_METHODS *sam_method, const NT_USER
 static NTSTATUS sam_ads_update_domain(const SAM_METHODS *sam_method, const SAM_DOMAIN_HANDLE *domain)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -984,7 +984,7 @@ done:
 static NTSTATUS sam_ads_update_account(const SAM_METHODS *sam_method, const SAM_ACCOUNT_HANDLE *account)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -992,7 +992,7 @@ static NTSTATUS sam_ads_update_account(const SAM_METHODS *sam_method, const SAM_
 static NTSTATUS sam_ads_delete_account(const SAM_METHODS *sam_method, const SAM_ACCOUNT_HANDLE *account)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 
 
@@ -1003,7 +1003,7 @@ static NTSTATUS sam_ads_delete_account(const SAM_METHODS *sam_method, const SAM_
 static NTSTATUS sam_ads_enum_accounts(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, uint16 acct_ctrl, uint32 *account_count, SAM_ACCOUNT_ENUM **accounts)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1040,7 +1040,7 @@ static NTSTATUS sam_ads_get_account_by_sid(const SAM_METHODS *sam_method, const
 static NTSTATUS sam_ads_get_account_by_sid(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, const uint32 access_desired, const DOM_SID *account_sid, SAM_ACCOUNT_HANDLE **account)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1078,7 +1078,7 @@ static NTSTATUS sam_ads_get_account_by_name(const SAM_METHODS *sam_method, const
 static NTSTATUS sam_ads_get_account_by_name(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, const uint32 access_desired, const char *account_name, SAM_ACCOUNT_HANDLE **account)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1088,7 +1088,7 @@ static NTSTATUS sam_ads_get_account_by_name(const SAM_METHODS *sam_method, const
 static NTSTATUS sam_ads_create_group(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, uint32 access_desired, const char *group_name, uint16 group_ctrl, SAM_GROUP_HANDLE **group)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1096,7 +1096,7 @@ static NTSTATUS sam_ads_create_group(const SAM_METHODS *sam_method, const NT_USE
 static NTSTATUS sam_ads_add_group(const SAM_METHODS *sam_method, const SAM_GROUP_HANDLE *group)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1104,7 +1104,7 @@ static NTSTATUS sam_ads_add_group(const SAM_METHODS *sam_method, const SAM_GROUP
 static NTSTATUS sam_ads_update_group(const SAM_METHODS *sam_method, const SAM_GROUP_HANDLE *group)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1112,7 +1112,7 @@ static NTSTATUS sam_ads_update_group(const SAM_METHODS *sam_method, const SAM_GR
 static NTSTATUS sam_ads_delete_group(const SAM_METHODS *sam_method, const SAM_GROUP_HANDLE *group)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1196,7 +1196,7 @@ static NTSTATUS sam_ads_enum_groups(const SAM_METHODS *sam_method, const NT_USER
 static NTSTATUS sam_ads_get_group_by_sid(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, const uint32 access_desired, const DOM_SID *groupsid, SAM_GROUP_HANDLE **group)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1204,7 +1204,7 @@ static NTSTATUS sam_ads_get_group_by_sid(const SAM_METHODS *sam_method, const NT
 static NTSTATUS sam_ads_get_group_by_name(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, const uint32 access_desired, const char *name, SAM_GROUP_HANDLE **group)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1212,7 +1212,7 @@ static NTSTATUS sam_ads_get_group_by_name(const SAM_METHODS *sam_method, const N
 static NTSTATUS sam_ads_add_member_to_group(const SAM_METHODS *sam_method, const SAM_GROUP_HANDLE *group, const SAM_GROUP_MEMBER *member)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1220,7 +1220,7 @@ static NTSTATUS sam_ads_add_member_to_group(const SAM_METHODS *sam_method, const
 static NTSTATUS sam_ads_delete_member_from_group(const SAM_METHODS *sam_method, const SAM_GROUP_HANDLE *group, const SAM_GROUP_MEMBER *member)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1228,7 +1228,7 @@ static NTSTATUS sam_ads_delete_member_from_group(const SAM_METHODS *sam_method,
 static NTSTATUS sam_ads_enum_groupmembers(const SAM_METHODS *sam_method, const SAM_GROUP_HANDLE *group, uint32 *members_count, SAM_GROUP_MEMBER **members)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
@@ -1236,7 +1236,7 @@ static NTSTATUS sam_ads_enum_groupmembers(const SAM_METHODS *sam_method, const S
 static NTSTATUS sam_ads_get_groups_of_sid(const SAM_METHODS *sam_method, const NT_USER_TOKEN *access_token, const DOM_SID **sids, const uint16 group_ctrl, uint32 *group_count, SAM_GROUP_ENUM **groups)
 {
 	ADS_STATUS	ads_status = ADS_STATUS_NOT_IMPLEMENTED;
-	DEBUG(0,("sam_ads: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_ads: %s was called!\n",FUNCTION_MACRO));
 	SAM_ASSERT(sam_method);
 	return ads_ntstatus(ads_status);
 }
diff --git a/source3/sam/sam_skel.c b/source3/sam/sam_skel.c
index 8073470716..b4d64bb6da 100644
--- a/source3/sam/sam_skel.c
+++ b/source3/sam/sam_skel.c
@@ -35,26 +35,26 @@ SAM_MODULE_VERSIONING_MAGIC
 
 static NTSTATUS sam_skel_get_sec_desc(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, const DOM_SID *sid, SEC_DESC **sd)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_set_sec_desc(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, const DOM_SID *sid, const SEC_DESC *sd)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 	
 static NTSTATUS sam_skel_lookup_sid(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, TALLOC_CTX *mem_ctx, const DOM_SID *sid, char **name, uint32 *type)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_lookup_name(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, const char *name, DOM_SID *sid, uint32 *type)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
@@ -63,13 +63,13 @@ static NTSTATUS sam_skel_lookup_name(const SAM_METHODS *sam_methods, const NT_US
 
 static NTSTATUS sam_skel_update_domain(const SAM_METHODS *sam_methods, const SAM_DOMAIN_HANDLE *domain)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_get_domain_handle(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, SAM_DOMAIN_HANDLE **domain)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
@@ -78,44 +78,44 @@ static NTSTATUS sam_skel_get_domain_handle(const SAM_METHODS *sam_methods, const
 
 static NTSTATUS sam_skel_create_account(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, const char *account_name, uint16 acct_ctrl, SAM_ACCOUNT_HANDLE **account)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_add_account(const SAM_METHODS *sam_methods, const SAM_ACCOUNT_HANDLE *account)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_update_account(const SAM_METHODS *sam_methods, const SAM_ACCOUNT_HANDLE *account)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_delete_account(const SAM_METHODS *sam_methods, const SAM_ACCOUNT_HANDLE *account)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_enum_accounts(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint16 acct_ctrl, uint32 *account_count, SAM_ACCOUNT_ENUM **accounts)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
 static NTSTATUS sam_skel_get_account_by_sid(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, const DOM_SID *accountsid, SAM_ACCOUNT_HANDLE **account)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_get_account_by_name(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, const char *name, SAM_ACCOUNT_HANDLE **account)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
@@ -124,69 +124,69 @@ static NTSTATUS sam_skel_get_account_by_name(const SAM_METHODS *sam_methods, con
 
 static NTSTATUS sam_skel_create_group(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, const char *account_name, uint16 group_ctrl, SAM_GROUP_HANDLE **group)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_add_group(const SAM_METHODS *sam_methods, const SAM_GROUP_HANDLE *group)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_update_group(const SAM_METHODS *sam_methods, const SAM_GROUP_HANDLE *group)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_delete_group(const SAM_METHODS *sam_methods, const SAM_GROUP_HANDLE *group)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_enum_groups(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint16 group_ctrl, uint32 *groups_count, SAM_GROUP_ENUM **groups)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_get_group_by_sid(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, const DOM_SID *groupsid, SAM_GROUP_HANDLE **group)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_get_group_by_name(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, uint32 access_desired, const char *name, SAM_GROUP_HANDLE **group)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
 static NTSTATUS sam_skel_add_member_to_group(const SAM_METHODS *sam_methods, const SAM_GROUP_HANDLE *group, const SAM_GROUP_MEMBER *member)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_delete_member_from_group(const SAM_METHODS *sam_methods, const SAM_GROUP_HANDLE *group, const SAM_GROUP_MEMBER *member)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 static NTSTATUS sam_skel_enum_groupmembers(const SAM_METHODS *sam_methods, const SAM_GROUP_HANDLE *group, uint32 *members_count, SAM_GROUP_MEMBER **members)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 
 static NTSTATUS sam_skel_get_groups_of_sid(const SAM_METHODS *sam_methods, const NT_USER_TOKEN *access_token, const DOM_SID **sids, uint16 group_ctrl, uint32 *group_count, SAM_GROUP_ENUM **groups)
 {
-	DEBUG(0,("sam_skel: %s was called!\n",__FUNCTION__));
+	DEBUG(0,("sam_skel: %s was called!\n",FUNCTION_MACRO));
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 96520c0eef..50c0e75561 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -100,7 +100,7 @@ void cgi_load_variables(void)
 #ifdef DEBUG_COMMENTS
 	char dummy[100]="";
 	print_title(dummy);
-	d_printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
+	d_printf("<!== Start dump in cgi_load_variables() %s ==>\n",FILE_MACRO);
 #endif
 
 	if (!content_length) {