Fix form parameters as per #571086.

gmap_macro_builder.module

@@ -54,7 +54,7 @@ function gmap_macro_builder_menu() {
  *   Fields to hide from the map. (See code for details.)
  *   Suggestions for better ways of doing this welcome!
  */
-function gmap_macro_builder_form(&$form_state, $settings = array(), $hide = array()) {
+function gmap_macro_builder_form($form, &$form_state, $settings = array(), $hide = array()) {
   $path = drupal_get_path('module', 'gmap');
 
   $form['macroform'] = array(

gmap_settings_ui.inc

@@ -6,7 +6,7 @@
  * GMap settings form.
  */
 
-function gmap_admin_settings(&$form_state) {
+function gmap_admin_settings($form, &$form_state) {
   // Reset the icondata cache.
   gmap_get_icondata(TRUE);