Attachment #101998 for bug #153538




            [
              AC_LANG_SOURCE(
[#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "$5"
int main (void)
{
  const char *version = $6;
  char wanted[[]] = "$2";
  char *version_tok, *wanted_tok = wanted;
  char *version_tmp, *wanted_tmp;
  fprintf (stderr, "%s\n", version);
  if (!version) return EXIT_FAILURE;
  version_tok = strdup(version);
  for (version_tok = strtok_r(version_tok, ".", &version_tmp),
       wanted_tok  = strtok_r(wanted_tok,  ".", &wanted_tmp);
       version_tok != NULL && wanted_tok != NULL;
       version_tok = strtok_r(NULL, ".", &version_tmp),
       wanted_tok  = strtok_r(NULL, ".", &wanted_tmp)) {
    char *version_endptr, *wanted_endptr;
    unsigned long version_bit = strtoul(version_tok, &version_endptr, 10);
    unsigned long wanted_bit  = strtoul(wanted_tok,  &wanted_endptr,  10);
    if (version_bit < wanted_bit)
      return EXIT_FAILURE;
    if (version_bit > wanted_bit)
      return EXIT_SUCCESS;
    if (strcmp(version_endptr, wanted_endptr) > 0)
      return EXIT_SUCCESS;
    if (strcmp(version_endptr, wanted_endptr) < 0)
      return EXIT_FAILURE;
  }
  return wanted_tok == NULL ? EXIT_SUCCESS : EXIT_FAILURE;
}]
              )
            ],

Lines 782-788 Link Here

(-)povray-3.6.1/source/png_pov.cpp~ (-1 / +1 lines)
782	{	782	{
783	// finished prematurely - trick into thinking done	783	// finished prematurely - trick into thinking done
784	png_ptr->num_rows = png_ptr->row_number;	784	png_ptr->num_rows = png_ptr->row_number;
785	png_write_finish_row(png_ptr);	785	png_write_row(png_ptr, row_ptr);
786	}	786	}
787		787
788	#ifdef POV_COMMENTS // temporarily skip comment writing code	788	#ifdef POV_COMMENTS // temporarily skip comment writing code

Return to bug 153538

Lines 353-365 Link Here

(-)povray-3.6.1/acinclude.m4~ (-1 / +24 lines)
353	[	353	[
354	AC_LANG_SOURCE(	354	AC_LANG_SOURCE(
355	[#include <stdio.h>	355	[#include <stdio.h>
		356	#include <stdlib.h>
356	#include <string.h>	357	#include <string.h>
357	#include "$5"	358	#include "$5"
358	int main (void)	359	int main (void)
359	{	360	{
360	const char *version = $6;	361	const char *version = $6;
		362	char wanted[[]] = "$2";
		363	char version_tok, wanted_tok = wanted;
		364	char version_tmp, wanted_tmp;
361	fprintf (stderr, "%s\n", version);	365	fprintf (stderr, "%s\n", version);
362	return ! (strcmp (version ? version : "", "$2") >= 0);	366	if (!version) return EXIT_FAILURE;
		367	version_tok = strdup(version);
		368	for (version_tok = strtok_r(version_tok, ".", &version_tmp),
		369	wanted_tok = strtok_r(wanted_tok, ".", &wanted_tmp);
		370	version_tok != NULL && wanted_tok != NULL;
		371	version_tok = strtok_r(NULL, ".", &version_tmp),
		372	wanted_tok = strtok_r(NULL, ".", &wanted_tmp)) {
		373	char version_endptr, wanted_endptr;
		374	unsigned long version_bit = strtoul(version_tok, &version_endptr, 10);
		375	unsigned long wanted_bit = strtoul(wanted_tok, &wanted_endptr, 10);
		376	if (version_bit < wanted_bit)
		377	return EXIT_FAILURE;
		378	if (version_bit > wanted_bit)
		379	return EXIT_SUCCESS;
		380	if (strcmp(version_endptr, wanted_endptr) > 0)
		381	return EXIT_SUCCESS;
		382	if (strcmp(version_endptr, wanted_endptr) < 0)
		383	return EXIT_FAILURE;
		384	}
		385	return wanted_tok == NULL ? EXIT_SUCCESS : EXIT_FAILURE;
363	}]	386	}]
364	)	387	)
365	],	388	],