dae6aa285

Rob Landley

2006-03-09

SOURCE BUG Duration: 17s

Subject

Fixup to the previous (portability) patch. Linux actually does need arpa/inet.h rather than netinet/in.h, otherwise we get warnings.

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

include/inet_common.h +1 -1 include/libbb.h +0 -1 include/platform.h +8 -0

include/inet_common.h+1 -1

@@ -11,7 +11,7 @@
	#include <features.h>
	#include <sys/types.h>
	#include <sys/socket.h>
-	#include <netinet/in.h>
+	#include "platform.h"


	extern const char bb_INET_default[]; /* = "default" */

include/libbb.h+0 -1

@@ -20,7 +20,6 @@
	#include <stdint.h>

	#include <netdb.h>
-	#include <netinet/in.h>

	#include <features.h>

include/platform.h+8 -0

@@ -92,8 +92,16 @@
	#define BB_BIG_ENDIAN 0
	#endif

+	/* ---- Networking ------------------------------------------ */
+	#ifndef __APPLE__
+	#include <arpa/inet.h>
+	#else
+	#include <netinet/in.h>
+	#endif
+
	/* ---- miscellaneous --------------------------------------- */
	/* NLS stuff */
+	/* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */
	#define _(Text) Text
	#define N_(Text) (Text)