Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

Fix compilation error with MSVC.

Browse Source
This commit is contained in:
Bruno Haible
2012-07-01 18:07:20 +02:00
parent bf93ebd28e
commit 064483191f
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2012-07-01 Bruno Haible <bruno@clisp.org>
Fix compilation error with MSVC.
* src/output.cc: Include config.h.
(DYNAMIC_ARRAY, FREE_DYNAMIC_ARRAY): New macros, copied from
src/search.cc.
(output_constant): Use them.
2012-07-01 Bruno Haible <bruno@clisp.org> 2012-07-01 Bruno Haible <bruno@clisp.org>
Remove old infrastructure for building with MSVC. Remove old infrastructure for building with MSVC.

28
src/output.cc
View File

@@ -1,5 +1,5 @@
/* Output routines. /* Output routines.
Copyright (C) 1989-1998, 2000, 2002-2004, 2006-2007, 2009, 2011 Free Software Foundation, Inc. Copyright (C) 1989-1998, 2000, 2002-2004, 2006-2007, 2009, 2011-2012 Free Software Foundation, Inc.
Written by Douglas C. Schmidt <schmidt@ics.uci.edu> Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
and Bruno Haible <bruno@clisp.org>. and Bruno Haible <bruno@clisp.org>.
@@ -28,6 +28,29 @@
#include <limits.h> /* defines SCHAR_MAX etc. */ #include <limits.h> /* defines SCHAR_MAX etc. */
#include "options.h" #include "options.h"
#include "version.h" #include "version.h"
#include "config.h"
/* ============================== Portability ============================== */
/* Dynamically allocated array with dynamic extent:
Example:
DYNAMIC_ARRAY (my_array, int, n);
...
FREE_DYNAMIC_ARRAY (my_array);
Attention: depending on your implementation my_array is either the array
itself or a pointer to the array! Always use my_array only as expression!
*/
#if HAVE_DYNAMIC_ARRAY
#define DYNAMIC_ARRAY(var,eltype,size) eltype var[size]
#define FREE_DYNAMIC_ARRAY(var)
#else
#define DYNAMIC_ARRAY(var,eltype,size) eltype *var = new eltype[size]
#define FREE_DYNAMIC_ARRAY(var) delete[] var
#endif
/* ========================================================================= */
/* The "const " qualifier. */ /* The "const " qualifier. */
static const char *const_always; static const char *const_always;
@@ -220,10 +243,11 @@ static void
output_constant (struct Output_Constants& style, const char *name, int value) output_constant (struct Output_Constants& style, const char *name, int value)
{ {
const char *prefix = option.get_constants_prefix (); const char *prefix = option.get_constants_prefix ();
char combined_name[strlen (prefix) + strlen (name) + 1]; DYNAMIC_ARRAY (combined_name, char, strlen (prefix) + strlen (name) + 1);
strcpy (combined_name, prefix); strcpy (combined_name, prefix);
strcpy (combined_name + strlen (prefix), name); strcpy (combined_name + strlen (prefix), name);
style.output_item (combined_name, value); style.output_item (combined_name, value);
FREE_DYNAMIC_ARRAY (combined_name);
} }
/* Outputs the maximum and minimum hash values etc. */ /* Outputs the maximum and minimum hash values etc. */