diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index 6919f1d55f027580c2cf3ecd89502de01d763900..c78f92e732ec7fca11f10257461ca27b5e5f70f3 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.553 2006-10-09 13:26:27 geuzaine Exp $ +// $Id: GUI.cpp,v 1.554 2006-10-10 14:04:13 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -322,6 +322,7 @@ Context_Item menu_geometry[] = { Context_Item menu_mesh[] = { {"1Mesh", NULL} , {"Define", (Fl_Callback *)mesh_define_cb} , + {"Edit", (Fl_Callback *)mesh_edit_cb} , {"1D", (Fl_Callback *)mesh_1d_cb} , {"2D", (Fl_Callback *)mesh_2d_cb} , {"3D", (Fl_Callback *)mesh_3d_cb} , @@ -330,7 +331,6 @@ Context_Item menu_mesh[] = { #if defined(HAVE_NETGEN) {"Optimize quality", (Fl_Callback *)mesh_optimize_cb} , #endif - {"Edit", (Fl_Callback *)mesh_edit_cb} , {"Save", (Fl_Callback *)mesh_save_cb} , {0} }; diff --git a/configure b/configure index ee4c94c18da93e9fce99329b4ba8dac37632479f..cec80e4a0453d77d567688ec99656fb423e0f5c9 100755 --- a/configure +++ b/configure @@ -5219,10 +5219,11 @@ _ACEOF if test $ac_cv_sizeof_size_t != 4; then - FLAGS="$FLAGS -DHAVE_64BIT_SIZE_T" if test $ac_cv_sizeof_size_t != 8; then { echo "$as_me:$LINENO: WARNING: Unsupported size of size_t - this may affect FNV hashing." >&5 echo "$as_me: WARNING: Unsupported size of size_t - this may affect FNV hashing." >&2;} + else + FLAGS="$FLAGS -DHAVE_64BIT_SIZE_T" fi fi diff --git a/configure.in b/configure.in index bb470b40d52b6c390e3bead066811baf503381d6..d9a0be7ba543d7ef6eef81ad8e912df3739c4ec1 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.104 2006-10-01 02:48:16 guzik Exp $ +dnl $Id: configure.in,v 1.105 2006-10-10 14:04:12 geuzaine Exp $ dnl dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle dnl @@ -612,9 +612,10 @@ dnl Compiler characteristics dnl Check sizeof size_t (flag as 64 if not 32) AC_CHECK_SIZEOF([size_t]) if test $ac_cv_sizeof_size_t != 4; then - FLAGS="$FLAGS -DHAVE_64BIT_SIZE_T" if test $ac_cv_sizeof_size_t != 8; then AC_MSG_WARN([Unsupported size of size_t - this may affect FNV hashing.]) + else + FLAGS="$FLAGS -DHAVE_64BIT_SIZE_T" fi fi