pyrox.dev
1diff -ru glibc-2.18-orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c
2--- glibc-2.18-orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200
3+++ glibc-2.18/sunrpc/rpc_main.c 2013-11-15 12:04:48.041006977 +0100
4@@ -78,7 +78,7 @@
5
6 static const char *svcclosetime = "120";
7 static int cppDefined; /* explicit path for C preprocessor */
8-static const char *CPP = "/lib/cpp";
9+static const char *CPP = "cpp";
10 static const char CPPFLAGS[] = "-C";
11 static char *pathbuf;
12 static int cpp_pid;
13@@ -107,7 +107,6 @@
14 static void open_output (const char *infile, const char *outfile);
15 static void add_warning (void);
16 static void clear_args (void);
17-static void find_cpp (void);
18 static void open_input (const char *infile, const char *define);
19 static int check_nettype (const char *name, const char *list_to_check[]);
20 static void c_output (const char *infile, const char *define,
21@@ -322,25 +321,6 @@
22 argcount = FIXEDARGS;
23 }
24
25-/* make sure that a CPP exists */
26-static void
27-find_cpp (void)
28-{
29- struct stat64 buf;
30-
31- if (stat64 (CPP, &buf) == 0)
32- return;
33-
34- if (cppDefined) /* user specified cpp but it does not exist */
35- {
36- fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
37- crash ();
38- }
39-
40- /* fall back to system CPP */
41- CPP = "cpp";
42-}
43-
44 /*
45 * Open input file with given define for C-preprocessor
46 */
47@@ -359,7 +339,6 @@
48 switch (cpp_pid)
49 {
50 case 0:
51- find_cpp ();
52 putarg (0, CPP);
53 putarg (1, CPPFLAGS);
54 addarg (define);