From e09d690e2b475c23709f8eff6053c350065eeaff Mon Sep 17 00:00:00 2001 From: Ryan Flegel Date: Fri, 1 May 2009 01:25:49 +0000 Subject: [PATCH] Removing formfeed characters from source SVN-Revision: 5883 --- src/gui/menu.cpp | 6 +++--- src/gui/menu.hpp | 4 ++-- src/obstack/obstack.c | 3 +-- src/obstack/obstack.h | 10 +++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index 6571e3f30..abed287d7 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -112,7 +112,7 @@ bool confirm_dialog(Surface *background, std::string text) return false; } - + void Menu::push_current(Menu* pmenu) { @@ -177,7 +177,7 @@ Menu::recalc_pos() (*i)->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2); } } - + MenuItem::MenuItem(MenuItemKind _kind, int _id) : kind(_kind) , id(_id) { @@ -228,7 +228,7 @@ std::string MenuItem::get_input_with_symbol(bool active_item) return string; } - + Menu::~Menu() { all_menus.remove(this); diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp index 2875b1374..66033c180 100644 --- a/src/gui/menu.hpp +++ b/src/gui/menu.hpp @@ -52,7 +52,7 @@ enum MenuItemKind { }; class Menu; - + class MenuItem { public: @@ -88,7 +88,7 @@ private: /// keyboard key or joystick button bool input_flickering; }; - + class Menu { static Color default_color; diff --git a/src/obstack/obstack.c b/src/obstack/obstack.c index e0cac0725..7f51a271f 100644 --- a/src/obstack/obstack.c +++ b/src/obstack/obstack.c @@ -94,7 +94,6 @@ int obstack_exit_failure = EXIT_FAILURE; (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \ } while (0) - /* Initialize an obstack H for use. Specify chunk size SIZE (0 means default). Objects start on multiples of ALIGNMENT (0 means use default). CHUNKFUN is the function to use to allocate chunks, @@ -295,7 +294,7 @@ _obstack_allocated_p (struct obstack *h, void *obj) } return lp != 0; } - + /* Free objects in obstack H, including OBJ and everything allocate more recently than OBJ. If OBJ is zero, free everything in H. */ diff --git a/src/obstack/obstack.h b/src/obstack/obstack.h index 73ab42524..141be2710 100644 --- a/src/obstack/obstack.h +++ b/src/obstack/obstack.h @@ -109,7 +109,7 @@ Summary: #ifdef __cplusplus extern "C" { #endif - + /* We need the type of a pointer subtraction. If __PTRDIFF_TYPE__ is defined, as with GNU C, use that; that way we don't pollute the namespace with 's symbols. Otherwise, include @@ -189,7 +189,7 @@ extern int _obstack_memory_used (struct obstack *); void obstack_free (struct obstack *obstack, void *block); - + /* Error handler called when `obstack_chunk_alloc' failed to allocate more memory. This can be set to a user defined function which should either abort gracefully or use longjump - but shouldn't @@ -198,7 +198,7 @@ extern void (*obstack_alloc_failed_handler) (void); /* Exit value used when `print_and_abort' is used. */ extern int obstack_exit_failure; - + /* Pointer to beginning of object being allocated or to be allocated next. Note that this might not be the final address of the object because a new chunk might be needed to hold the final size. */ @@ -249,7 +249,7 @@ extern int obstack_exit_failure; #define obstack_blank_fast(h,n) ((h)->next_free += (n)) #define obstack_memory_used(h) _obstack_memory_used (h) - + #if defined __GNUC__ && defined __STDC__ && __STDC__ /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and does not implement __extension__. But that compiler doesn't define @@ -401,7 +401,7 @@ __extension__ \ if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ __o->next_free = __o->object_base = (char *)__obj; \ else (obstack_free) (__o, __obj); }) - + #else /* not __GNUC__ or not __STDC__ */ # define obstack_object_size(h) \ -- 2.11.0