Date: Thu, 14 Nov 2013 18:41:58 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258139 - head/contrib/gperf/src Message-ID: <201311141841.rAEIfwFU040620@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Thu Nov 14 18:41:58 2013 New Revision: 258139 URL: http://svnweb.freebsd.org/changeset/base/258139 Log: Repair build after svn r258115 options.get_size_type() appears to return a const char *, so assume that its a string as oppose to *nothing*. I have no idea what apple's code is trying to do here: http://opensource.apple.com/source/gperf/gperf-9/patches/size_type.patch Modified: head/contrib/gperf/src/output.cc Modified: head/contrib/gperf/src/output.cc ============================================================================== --- head/contrib/gperf/src/output.cc Thu Nov 14 16:10:21 2013 (r258138) +++ head/contrib/gperf/src/output.cc Thu Nov 14 18:41:58 2013 (r258139) @@ -779,7 +779,7 @@ Output::output_hash_function () const " register %s len;\n" : option[ANSIC] | option[CPLUSPLUS] ? "(register const char *str, register %s len)\n" : - "", option.get_size_type()); + "%s", option.get_size_type()); /* Note that when the hash function is called, it has already been verified that min_key_len <= len <= max_key_len. */ @@ -1907,7 +1907,7 @@ Output::output_lookup_function () const " register %s len;\n" : option[ANSIC] | option[CPLUSPLUS] ? "(register const char *str, register %s len)\n" : - "", option.get_size_type()); + "%s", option.get_size_type()); /* Output the function's body. */ printf ("{\n");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311141841.rAEIfwFU040620>