removed some #ifdef's BSD because we can do the same on RedHat, too...

3 files changed, 1 insertions, 18 deletions

diff --git a/stringbuf.c b/stringbuf.c
index 12bb02d6..21f487d5 100755
--- a/stringbuf.c
+++ b/stringbuf.c
@@ -37,16 +37,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */

-#ifdef __FreeBSD__
-#define	BSD
-#endif
-
-
-#ifdef BSD
 #include <stdlib.h>
-#else
-#include <malloc.h>

-#endif
 #include <assert.h>

 #include <string.h>

 #include "liblogging-stub.h"

diff --git a/syslogd.c b/syslogd.c
index bc303870..3670354c 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2487,11 +2487,7 @@ fprintf(stderr, "create_unix_socket(%s)\n", path);
 	(void) strncpy(sunx.sun_path, path, sizeof(sunx.sun_path));
 	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
 	if (fd < 0 || bind(fd, (struct sockaddr *) &sunx,
-#ifdef BSD
 			   SUN_LEN(&sunx)) < 0 ||
-#else
-			   sizeof(sunx.sun_family)+strlen(sunx.sun_path)) < 0 ||
-#endif
 	    chmod(path, 0666) < 0) {
 		(void) snprintf(line, sizeof(line), "cannot create %s", path);
 		logerror(line);
@@ -3596,7 +3592,7 @@ void endtty()
 	longjmp(ttybuf, 1);
 }
 
-/** TODO:
+/**
  * BSD setutent/getutent() replacement routines
  * The following routines emulate setutent() and getutent() under
  * BSD because they are not available there. We only emulate what we actually
diff --git a/template.c b/template.c
index cda54918..304ecad9 100644
--- a/template.c
+++ b/template.c
@@ -8,11 +8,7 @@
 #endif
 
 #include <stdio.h>
-#ifdef BSD
 #include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>