sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r19242: merge from samba3:

Browse Source 
handle NO_CONFIG_H in libreplace

metze
(This used to be commit 909d736a4bf5a7adfcd64eecf6bb2a92211c6f96)
This commit is contained in:
Stefan Metzmacher 2006-10-11 11:52:49 +00:00 committed by Gerald (Jerry) Carter
parent 5916c6c469
commit b6582987fe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/include/includes.h
View File

@ -21,17 +21,16 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef NO_CONFIG_H /* for some tests */
#include "lib/replace/replace.h"
/* make sure we have included the correct config.h */
#ifndef NO_CONFIG_H /* for some tests */
#ifndef CONFIG_H_IS_FROM_SAMBA
#error "make sure you have removed all config.h files from standalone builds!"
#error "the included config.h isn't from samba!"
#endif
#endif /* NO_CONFIG_H */
#include "local.h"
#ifdef __GNUC__

2
source4/lib/replace/replace.h
View File

@ -28,7 +28,9 @@
#ifndef _LIBREPLACE_REPLACE_H
#define _LIBREPLACE_REPLACE_H
#ifndef NO_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_STANDARDS_H
#include <standards.h>