Again: Internal error in nmbd / Correction

Dipl.-Ing. Dirk Krause d.krause at e-technik.fh-schmalkalden.de
Tue Aug 15 14:06:22 GMT 2000


Hi again,
I have made some tests with interfaces.c to avoid shipping
2 nearly equal files.
Here is a version that can be used for both configure and
make.
The run of configure is indicated by AUTOCONF_TEST set, so
we can add
#include "includes.h"
in the #else-part.
The "#ifdef HAVE_SYS_TIME_H"-section should be moved after the
config.h-inclusion, maybee the "ifndef SIOCGIFCONF"-section too.
Here is the output of diff -u:

---------- Start of diff -u ----------

--- interfaces.1	Tue Aug 15 15:43:43 2000
+++ interfaces.c	Tue Aug 15 15:44:29 2000
@@ -39,9 +39,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 #include <net/if.h>
 
@@ -56,10 +53,12 @@
 	struct in_addr netmask;
 };
 #else
-#include "config.h"
-#include "interfaces.h"
+#include "includes.h"
 #endif
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif

---------- End of diff -u ----------

Greetings

Dirk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-sun-c-file
Size: 9401 bytes
Desc: interfaces.c
Url : http://lists.samba.org/archive/samba/attachments/20000815/741f9592/attachment.bin


More information about the samba mailing list