Index: trunk/src/Makefile.in.mod/gen_core_lists.sh =================================================================== --- trunk/src/Makefile.in.mod/gen_core_lists.sh (revision 992) +++ trunk/src/Makefile.in.mod/gen_core_lists.sh (revision 993) @@ -18,7 +18,7 @@ type = $0 sub("^type=", "", type) TYPE[basename] = type - print "// ", type, basename + print "/* ", type, basename " */" } Index: trunk/src/autoroute.c =================================================================== --- trunk/src/autoroute.c (revision 992) +++ trunk/src/autoroute.c (revision 993) @@ -1986,7 +1986,7 @@ result.right.Y1 = result.center.Y1 = result.left.Y1 = origbox.Y1; result.right.Y2 = result.center.Y2 = result.left.Y2 = origbox.Y1 + 1; /* validity of breaker is not important because the boxes are marked invalid */ - //assert (breakbox.X1 <= origbox.X2 && breakbox.X2 >= origbox.X1); + /*assert (breakbox.X1 <= origbox.X2 && breakbox.X2 >= origbox.X1);*/ /* left edge piece */ result.left.X1 = origbox.X1; result.left.X2 = breakbox.X1; @@ -3066,8 +3066,8 @@ routebox_t *rb = (routebox_t *) box; if (rb->flags.touched) return 0; -// if (rb->type == EXPANSION_AREA && !rb->flags.is_via) - // return 0; +/* if (rb->type == EXPANSION_AREA && !rb->flags.is_via)*/ + /* return 0; */ rbox = bloat_routebox (rb); if (!box_intersect (&rbox, foib->box)) return 0; @@ -4191,7 +4191,7 @@ /* we should never add edges on inactive layer groups to the heap. */ assert (is_layer_group_active[e->rb->group]); #if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_EXPANSION_BOXES) - //showedge (e); + /*showedge (e);*/ #endif if (e->rb->flags.is_thermal) { @@ -4574,7 +4574,7 @@ AutoRouteParameters.with_conflicts = with_conflicts; AutoRouteParameters.is_smoothing = is_smoothing; AutoRouteParameters.rip_always = is_smoothing; - AutoRouteParameters.last_smooth = 0; //lastpass; + AutoRouteParameters.last_smooth = 0; /*lastpass;*/ AutoRouteParameters.pass = pass + 1; } Index: trunk/src/dbus-pcbmain.c =================================================================== --- trunk/src/dbus-pcbmain.c (revision 992) +++ trunk/src/dbus-pcbmain.c (revision 993) @@ -58,13 +58,13 @@ DBUS_DISPATCH_DATA_REMAINS) return; - // TODO: IS THIS NEEDED? - // dbus_connection_ref (connection); + /* TODO: IS THIS NEEDED? */ + /* dbus_connection_ref (connection); */ /* Only dispatch once - we don't want to starve other mainloop users */ dbus_connection_dispatch (connection); - // dbus_connection_unref (connection); + /* dbus_connection_unref (connection); */ return; } @@ -74,7 +74,7 @@ IOWatchHandler *handler; handler = (IOWatchHandler *)data; - // Remove the watch registered with the HID + /* Remove the watch registered with the HID */ gui->unwatch_file (handler->pcb_watch); free (handler); } @@ -89,9 +89,9 @@ handler = (IOWatchHandler *) data.ptr; - // TODO: IS THIS NEEDED? - //if (connection) - // dbus_connection_ref (connection); + /* TODO: IS THIS NEEDED? */ + /* if (connection) + dbus_connection_ref (connection); */ if (condition & PCB_WATCH_READABLE) dbus_condition |= DBUS_WATCH_READABLE; @@ -108,8 +108,8 @@ dbus_watch_handle (handler->dbus_watch, dbus_condition); handler = NULL; - //if (connection) - // dbus_connection_unref (connection); + /*if (connection) + dbus_connection_unref (connection);*/ return; } @@ -121,7 +121,7 @@ TimeoutHandler *handler; handler = (TimeoutHandler *)data; - // Remove the timeout registered with the HID + /* Remove the timeout registered with the HID */ gui->stop_timer (handler->pcb_timer); free (handler); } @@ -133,9 +133,9 @@ TimeoutHandler *handler; handler = (TimeoutHandler *)data.ptr; - // Re-add the timeout, as PCB will remove the current one - // Do this before calling to dbus, incase DBus removes the timeout. - // We can't touch handler after libdbus has been run for this reason. + /* Re-add the timeout, as PCB will remove the current one + Do this before calling to dbus, incase DBus removes the timeout. + We can't touch handler after libdbus has been run for this reason. */ handler->pcb_timer = gui->add_timer (timeout_handler_cb, handler->interval, data); @@ -152,7 +152,7 @@ unsigned int dbus_flags; hidval temp; - // We won't create a watch until it becomes enabled. + /* We won't create a watch until it becomes enabled. */ if (!dbus_watch_get_enabled (dbus_watch)) return TRUE; @@ -183,7 +183,7 @@ static void watch_remove (DBusWatch * dbus_watch, void *data) { - // Free the associated data. Its destroy callback removes the watch + /* Free the associated data. Its destroy callback removes the watch */ dbus_watch_set_data (dbus_watch, NULL, NULL); } @@ -204,13 +204,13 @@ TimeoutHandler *handler; hidval temp; - // We won't create a timeout until it becomes enabled. + /* We won't create a timeout until it becomes enabled. */ if (!dbus_timeout_get_enabled (timeout)) return TRUE; - //FIXME: Need to store the interval, as PCB requires us - // to manually re-add the timer each time it expires. - // This is non-ideal, and hopefully can be changed? + /*FIXME: Need to store the interval, as PCB requires us + to manually re-add the timer each time it expires. + This is non-ideal, and hopefully can be changed? */ handler = (TimeoutHandler *)malloc (sizeof (TimeoutHandler)); temp.ptr = (void *)handler; @@ -226,7 +226,7 @@ static void timeout_remove (DBusTimeout * timeout, void *data) { - // Free the associated data. Its destroy callback removes the timer + /* Free the associated data. Its destroy callback removes the timer */ dbus_timeout_set_data (timeout, NULL, NULL); } @@ -244,11 +244,11 @@ dispatch_status_changed (DBusConnection * conn, DBusDispatchStatus new_status, void *data) { - // TODO: Can use this eventually to add one-shot idle work-functions to dispatch - // remaining IO. It could possibly replace the block_hook polling mechanism. - // (We could use a one-shot block_book to dispatch the work though.) - // - // *** NO DISPATCHING TO BE DONE INSIDE THIS FUNCTION *** + /* TODO: Can use this eventually to add one-shot idle work-functions to dispatch + remaining IO. It could possibly replace the block_hook polling mechanism. + (We could use a one-shot block_book to dispatch the work though.) + + *** NO DISPATCHING TO BE DONE INSIDE THIS FUNCTION *** */ } // END INTERNALS @@ -263,15 +263,15 @@ void pcb_dbus_connection_setup_with_mainloop (DBusConnection * connection) { - //ConnectionSetup *cs; + /* ConnectionSetup *cs; */ hidval temp; /* FIXME we never free the slot, so its refcount just keeps growing, * which is kind of broken. */ - //dbus_connection_allocate_data_slot (&connection_slot); - //if (connection_slot < 0) - // goto nomem; + /* dbus_connection_allocate_data_slot (&connection_slot); + if (connection_slot < 0) + goto nomem; */ #if 0 cs = connection_setup_new (connection); @@ -285,7 +285,7 @@ watch_add, watch_remove, watch_toggled, NULL, NULL)) -// cs, NULL)) +/* cs, NULL))*/ goto nomem; if (!dbus_connection_set_timeout_functions (connection, @@ -292,13 +292,13 @@ timeout_add, timeout_remove, timeout_toggled, NULL, NULL)) -// cs, NULL)) +/* cs, NULL))*/ goto nomem; dbus_connection_set_dispatch_status_function (connection, dispatch_status_changed, NULL, NULL); -// cs, NULL); +/* cs, NULL);*/ /* Register a new mainloop hook to mop up any unfinished IO. */ temp.ptr = (void *)connection; @@ -313,15 +313,15 @@ void pcb_dbus_connection_finish_with_mainloop (DBusConnection * connection) { - //ConnectionSetup *cs; + /*ConnectionSetup *cs; - //cs = dbus_connection_get_data (connection, connection_slot ); + cs = dbus_connection_get_data (connection, connection_slot ); - // Replace the stored data with NULL, thus freeing the old data - // DBus will call the function connection_setup_free() which we registered earlier - //dbus_connection_set_data (connection, connection_slot, NULL, NULL ); + Replace the stored data with NULL, thus freeing the old data + DBus will call the function connection_setup_free() which we registered earlier + dbus_connection_set_data (connection, connection_slot, NULL, NULL ); - //dbus_connection_free_data_slot( &connection_slot ); + dbus_connection_free_data_slot( &connection_slot );*/ if (!dbus_connection_set_watch_functions (connection, NULL, NULL, NULL, NULL, NULL)) Index: trunk/src/dbus.c =================================================================== --- trunk/src/dbus.c (revision 992) +++ trunk/src/dbus.c (revision 993) @@ -55,7 +55,7 @@ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - // TODO: Should check the message signature matches what we expect? + /* TODO: Should check the message signature matches what we expect? */ reply = dbus_message_new_method_return (message); if (reply == NULL) @@ -123,9 +123,9 @@ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - // TODO: Should check the message signature matches what we expect? + /* TODO: Should check the message signature matches what we expect? */ - // initialise the error struct + /* initialise the error struct */ dbus_error_init (&err); /* DON'T FREE action_name, as it belongs to DBUS, @@ -153,7 +153,7 @@ fprintf (stderr, " )\n"); #endif - // TODO: Proper return value from actions + /* TODO: Proper return value from actions */ hid_actionv (action_name, argc, argv); retval = 0; @@ -295,17 +295,17 @@ case DBUS_MESSAGE_TYPE_METHOD_RETURN: fprintf (stderr, "pcb_dbus: DBUG: Method return message\n"); - // WON'T ACTUALLY BE ANY UNLESS WE MAKE AN ASYNCRONOUS CALL? + /* WON'T ACTUALLY BE ANY UNLESS WE MAKE AN ASYNCRONOUS CALL? */ break; case DBUS_MESSAGE_TYPE_ERROR: fprintf (stderr, "pcb_dbus: DEBUG: Error message\n"); - // HOPE NOT! + /* HOPE NOT! */ break; case DBUS_MESSAGE_TYPE_SIGNAL: fprintf (stderr, "pcb_dbus: DEBUG: Signal message\n"); - // NONE AT PRESENT + /* NONE AT PRESENT */ break; default: @@ -329,10 +329,10 @@ NULL, NULL, NULL, NULL }; - // Initialise the error variable + /* Initialise the error variable */ dbus_error_init (&err); - // Connect to the bus + /* Connect to the bus */ pcb_dbus_conn = dbus_bus_get_private (DBUS_BUS_SESSION, &err); if (dbus_error_is_set (&err)) { @@ -342,7 +342,7 @@ if (pcb_dbus_conn == NULL) return; - // Request the canonical name for PCB on the bus + /* Request the canonical name for PCB on the bus */ ret = dbus_bus_request_name (pcb_dbus_conn, PCB_DBUS_CANONICAL_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING, &err); if (dbus_error_is_set (&err)) @@ -358,7 +358,7 @@ return; } - if (!dbus_connection_register_object_path (pcb_dbus_conn, PCB_DBUS_OBJECT_PATH, &object_vtable, NULL // void * user_data + if (!dbus_connection_register_object_path (pcb_dbus_conn, PCB_DBUS_OBJECT_PATH, &object_vtable, NULL /* void * user_data */ )) { fprintf (stderr, "pcb_dbus: Couldn't register DBUS handler for %s\n", @@ -366,10 +366,10 @@ return; } - // Setup intergration with the pcb mainloop + /* Setup intergration with the pcb mainloop */ pcb_dbus_connection_setup_with_mainloop (pcb_dbus_conn); -// dbus_error_free(&err); +/* dbus_error_free(&err); */ return; } @@ -379,10 +379,10 @@ { DBusError err; - // Initialise the error variable + /* Initialise the error variable */ dbus_error_init (&err); - // TODO: Could emit a "goodbye" signal here? + /* TODO: Could emit a "goodbye" signal here? */ dbus_connection_flush (pcb_dbus_conn); @@ -398,9 +398,9 @@ dbus_connection_close (pcb_dbus_conn); dbus_connection_unref (pcb_dbus_conn); - // Call DBus shutdown. This doesn't work with shared connections, - // only private ones (like we took out earlier). - // If any future module / plugin to PCB wants to use DBus too, - // we must remove this call. DBus will get shut-down when the app exits. + /* Call DBus shutdown. This doesn't work with shared connections, + only private ones (like we took out earlier). + If any future module / plugin to PCB wants to use DBus too, + we must remove this call. DBus will get shut-down when the app exits. */ dbus_shutdown (); } Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 992) +++ trunk/src/find.c (revision 993) @@ -385,7 +385,7 @@ static bool ADD_PAD_TO_LIST (Cardinal L, PadTypePtr Pad, int from_type, void *from_ptr, found_conn_type_t type) { -//fprintf(stderr, "ADD_PAD_TO_LIST cardinal %d %p %d\n", L, Pad, from_type); +/*fprintf(stderr, "ADD_PAD_TO_LIST cardinal %d %p %d\n", L, Pad, from_type);*/ if (User) AddObjectToFlagUndoList (PAD_TYPE, Pad->Element, Pad, Pad); SET_FLAG (TheFlag, Pad); @@ -615,7 +615,7 @@ void FreeComponentLookupMemory (void) { -//fprintf(stderr, "PadList free both\n"); +/*fprintf(stderr, "PadList free both\n");*/ free (PadList[0].Data); PadList[0].Data = NULL; free (PadList[1].Data); @@ -645,7 +645,7 @@ ENDALL_LOOP; for (i = 0; i < 2; i++) { -//fprintf(stderr, "PadList alloc %d: %d\n", i, NumberOfPads[i]); +/*fprintf(stderr, "PadList alloc %d: %d\n", i, NumberOfPads[i]);*/ /* allocate memory for working list */ PadList[i].Data = (void **)calloc (NumberOfPads[i], sizeof (PadTypePtr)); @@ -2380,11 +2380,11 @@ PadTypePtr orig_pad = Pad; int tlayer = -1; -//fprintf(stderr, "lg===\n"); +/*fprintf(stderr, "lg===\n");*/ for (entry = 0; entry < PCB->LayerGroups.Number[LayerGroup]; entry++) { Cardinal layer; layer = PCB->LayerGroups.Entries[LayerGroup][entry]; -//fprintf(stderr, "lg: %d\n", layer); +/*fprintf(stderr, "lg: %d\n", layer);*/ if (layer == COMPONENT_LAYER) tlayer = COMPONENT_LAYER; else if (layer == SOLDER_LAYER) @@ -2391,7 +2391,7 @@ tlayer = SOLDER_LAYER; } -//fprintf(stderr, "tlayer=%d\n", tlayer); +/*fprintf(stderr, "tlayer=%d\n", tlayer);*/ if (tlayer >= 0) { PAD_LOOP (e); @@ -2398,9 +2398,9 @@ { if ((orig_pad != pad) && (ic == GET_INTCONN(pad))) { int padlayer = TEST_FLAG (ONSOLDERFLAG, pad) ? SOLDER_LAYER : COMPONENT_LAYER; -//fprintf(stderr, "layergroup1: %d {%d %d %d} %d \n", tlayer, TEST_FLAG(ONSOLDERFLAG, pad), SOLDER_LAYER, COMPONENT_LAYER, padlayer); +/*fprintf(stderr, "layergroup1: %d {%d %d %d} %d \n", tlayer, TEST_FLAG(ONSOLDERFLAG, pad), SOLDER_LAYER, COMPONENT_LAYER, padlayer);*/ if ((!TEST_FLAG (TheFlag, pad)) && (tlayer != padlayer)) { -//fprintf(stderr, "layergroup2\n"); +/*fprintf(stderr, "layergroup2\n");*/ ADD_PAD_TO_LIST (padlayer, pad, PAD_TYPE, orig_pad, FCT_INTERNAL); if (LookupLOConnectionsToPad(pad, LayerGroup)) retv = true; Index: trunk/src/global.h =================================================================== --- trunk/src/global.h (revision 992) +++ trunk/src/global.h (revision 993) @@ -181,7 +181,7 @@ BoxType BoundingBox; \ long int ID; \ FlagType Flags - // struct LibraryEntryType *net + /* struct LibraryEntryType *net*/ /* Lines, pads, and rats all use this so they can be cross-cast. */ #define ANYLINEFIELDS \ @@ -458,7 +458,7 @@ pcb_fp_type_t Type; void **Tags; /* an array of void * tag IDs; last tag ID is NULL */ } LibraryEntryType, *LibraryEntryTypePtr; -//typedef LibraryEntryType *LibraryEntryTypePtr; +/*typedef LibraryEntryType *LibraryEntryTypePtr;*/ /* If the internal flag is set, the only field that is valid is Name, and the struct is allocated with malloc instead of Index: trunk/src/hid/common/draw_helpers.c =================================================================== --- trunk/src/hid/common/draw_helpers.c (revision 992) +++ trunk/src/hid/common/draw_helpers.c (revision 993) @@ -55,7 +55,7 @@ this_y = v->point[1]; gui->draw_line (gc, last_x, last_y, this_x, this_y); - // gui->fill_circle (gc, this_x, this_y, 30); + /* gui->fill_circle (gc, this_x, this_y, 30); */ last_x = this_x; last_y = this_y; Index: trunk/src/hid/common/hid_resource.c =================================================================== --- trunk/src/hid/common/hid_resource.c (revision 992) +++ trunk/src/hid/common/hid_resource.c (revision 993) @@ -9,11 +9,11 @@ /* #define DEBUG_HID_RESOURCE */ -static int button_count; // number of buttons we have actions for -static int *button_nums; // list of button numbers -static int *mod_count; // how many mods they have -static unsigned *mods; // mods, in order, one button after another -static Resource** actions; // actions, in order, one button after another +static int button_count; /* number of buttons we have actions for */ +static int *button_nums; /* list of button numbers */ +static int *mod_count; /* how many mods they have */ +static unsigned *mods; /* mods, in order, one button after another */ +static Resource** actions; /* actions, in order, one button after another */ static Resource * res_wrap (char *value) @@ -37,7 +37,7 @@ s = strstr(value, "mod"); if (s) { - s += 3; // skip "mod" to get to number + s += 3; /* skip "mod" to get to number */ errno = 0; mod_num = strtol(s, (char**) NULL, 0); if (!errno) @@ -161,7 +161,7 @@ unsigned search_mask = mod_mask & ~M_Release; unsigned release_mask = mod_mask & M_Release; - // look for exact mod match + /* look for exact mod match */ for (i=start; i=0; j--) - if ((j & search_mask) == j) // this would work - for (i=start; i>1)) // set the top bit +#define M_Release (~((unsigned)-1>>1)) /* set the top bit */ void load_mouse_resource (const Resource *res); void do_mouse_action (int button, int mods); Index: trunk/src/hid/gcode/decompose.c =================================================================== --- trunk/src/hid/gcode/decompose.c (revision 992) +++ trunk/src/hid/gcode/decompose.c (revision 993) @@ -15,7 +15,7 @@ #include "auxiliary.h" #include "bitmap.h" #include "decompose.h" -//#include "progress.h" +/*#include "progress.h"*/ /* ---------------------------------------------------------------------- */ /* auxiliary bitmap manipulations */ @@ -577,7 +577,7 @@ if (bm1->h > 0) { /* to be sure */ - //progress_update(1-y/(double)bm1->h, progress); + /*progress_update(1-y/(double)bm1->h, progress);*/ } } @@ -585,7 +585,7 @@ bm_free (bm1); *plistp = plist; -// progress_update(1.0, progress); +/* progress_update(1.0, progress);*/ return 0; Index: trunk/src/hid/gcode/decompose.h =================================================================== --- trunk/src/hid/gcode/decompose.h (revision 992) +++ trunk/src/hid/gcode/decompose.h (revision 993) @@ -8,7 +8,7 @@ #define DECOMPOSE_H #include "potracelib.h" -//#include "progress.h" +/*#include "progress.h"*/ int bm_to_pathlist (const potrace_bitmap_t * bm, path_t ** plistp, const potrace_param_t * param); Index: trunk/src/hid/gcode/trace.c =================================================================== --- trunk/src/hid/gcode/trace.c (revision 992) +++ trunk/src/hid/gcode/trace.c (revision 993) @@ -18,7 +18,7 @@ #include "lists.h" #include "auxiliary.h" #include "trace.h" -//#include "progress.h" +/*#include "progress.h"*/ #define INFTY 10000000 /* it suffices that this is longer than any path; it need not be really infinite */ Index: trunk/src/hid/gtk/gtkhid-main.c =================================================================== --- trunk/src/hid/gtk/gtkhid-main.c (revision 992) +++ trunk/src/hid/gtk/gtkhid-main.c (revision 993) @@ -292,7 +292,7 @@ gdk_window_get_pointer (gtk_widget_get_window (out->drawing_area), NULL, NULL, &mask); #ifdef __APPLE__ - return (mask & ( 1 << 13 ) ) ? TRUE : FALSE; // The option key is not MOD1, although it should be... + return (mask & ( 1 << 13 ) ) ? TRUE : FALSE; /* The option key is not MOD1, although it should be...*/ #else return (mask & GDK_MOD1_MASK) ? TRUE : FALSE; #endif @@ -501,7 +501,7 @@ ghid_block_hook_prepare, ghid_block_hook_check, ghid_block_hook_dispatch, - NULL // No destroy notification + NULL /* No destroy notification */ }; static gboolean Index: trunk/src/hid/gtk/gui-config.c =================================================================== --- trunk/src/hid/gtk/gui-config.c (revision 992) +++ trunk/src/hid/gtk/gui-config.c (revision 993) @@ -655,7 +655,7 @@ exit (1); } else -// ghid_log("unrecognized option: %s\n", (*argv)[0]); +/* ghid_log("unrecognized option: %s\n", (*argv)[0]);*/ fprintf (stderr, "unrecognized option: %s\n", (*argv)[0]); } got_match:; Index: trunk/src/hid/gtk/gui-top-window.c =================================================================== --- trunk/src/hid/gtk/gui-top-window.c (revision 992) +++ trunk/src/hid/gtk/gui-top-window.c (revision 993) @@ -318,7 +318,7 @@ !g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) return false; - g_file_info_get_modification_time (info, &timeval); //&ghidgui->last_seen_mtime); + g_file_info_get_modification_time (info, &timeval); /*&ghidgui->last_seen_mtime);*/ g_object_unref (info); /* Ignore when the file on disk is the same age as when we last looked */ Index: trunk/src/hid/lesstif/main.c =================================================================== --- trunk/src/hid/lesstif/main.c (revision 992) +++ trunk/src/hid/lesstif/main.c (revision 993) @@ -1346,7 +1346,7 @@ alt_pressed = set; break; default: - // to include the Apple keyboard left and right command keys use XK_Meta_L and XK_Meta_R respectivly. + /* to include the Apple keyboard left and right command keys use XK_Meta_L and XK_Meta_R respectivly. */ return; } in_move_event = 1; @@ -3634,7 +3634,7 @@ poll( &fds, 1, 0 ); condition = fds.revents; - // Should we only include those we were asked to watch? + /* Should we only include those we were asked to watch? */ if (condition & POLLIN) pcb_condition |= PCB_WATCH_READABLE; if (condition & POLLOUT) Index: trunk/src/hid/lesstif/menu.c =================================================================== --- trunk/src/hid/lesstif/menu.c (revision 992) +++ trunk/src/hid/lesstif/menu.c (revision 993) @@ -1,4 +1,4 @@ -//* $Id$ */ +/* $Id$ */ #include "config.h" @@ -710,7 +710,7 @@ n = 0; stdarg(XmNlabelString, ls); XtSetValues(m_click, args, n); - //printf("need xy: msg `%s'\n", msg); + /*printf("need xy: msg `%s'\n", msg);*/ need_xy = 1; XBell(display, 100); while (!have_xy) { @@ -755,7 +755,7 @@ if (p == aw) have_xy = 1; } - //pcb_printf("have xy from %s: %$mD\n", XtName(aw), action_x, action_y); + /*pcb_printf("have xy from %s: %$mD\n", XtName(aw), action_x, action_y);*/ } lesstif_need_idle_proc(); @@ -1027,7 +1027,7 @@ cur_ntable = acc_num; } - //printf("\nmods %x key %d str `%s' in %p/%d\n", mods, (int)sym, buf, cur_table, cur_ntable); + /*printf("\nmods %x key %d str `%s' in %p/%d\n", mods, (int)sym, buf, cur_table, cur_ntable);*/ #define KM(m) ((m) & ~M_Multi) for (i = 0; i < cur_ntable; i++) { @@ -1138,7 +1138,7 @@ if ((r = resource_subres(node->v[i].subres, "a"))) { XmString as = XmStringCreatePCB(r->v[0].value); stdarg(XmNacceleratorText, as); - //stdarg(XmNaccelerator, r->v[1].value); + /*stdarg(XmNaccelerator, r->v[1].value);*/ note_accelerator(r->v[1].value, node->v[i].subres); } v = "button"; Index: trunk/src/hid/png/png.c =================================================================== --- trunk/src/hid/png/png.c (revision 992) +++ trunk/src/hid/png/png.c (revision 993) @@ -848,7 +848,7 @@ if (photo_outline && have_outline) { int black=gdImageColorResolve(photo_outline, 0x00, 0x00, 0x00); - // go all the way around the image, trying to fill the outline + /* go all the way around the image, trying to fill the outline */ for (x=0; x lsegs_ymax) break; @@ -1409,7 +1409,7 @@ for(x = lsegs_xmin; x < lsegs_xmax; x+= POLYGRID) { int pts, n; -// pcb_fprintf(global.f, "%% gridline at y %mi\n", y); +/* pcb_fprintf(global.f, "%% gridline at y %mi\n", y); */ retry2:; if (x > lsegs_xmax) break; Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 992) +++ trunk/src/main.c (revision 993) @@ -1821,7 +1821,7 @@ if (gui->printer || gui->exporter) { - // Workaround to fix batch output for non-C locales + /* Workaround to fix batch output for non-C locales */ setlocale(LC_NUMERIC,"C"); gui->do_export (0); exit (0); Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 992) +++ trunk/src/move.c (revision 993) @@ -508,12 +508,12 @@ MoveRatToLayer (RatType *Rat) { LineTypePtr newone; - //Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; - //Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; - // if VIAFLAG - // if we're on a pin, add a thermal - // else make a via and a wire, but 0-length wire not good - // else as before + /*Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; + Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; + if VIAFLAG + if we're on a pin, add a thermal + else make a via and a wire, but 0-length wire not good + else as before*/ newone = CreateNewLineOnLayer (Dest, Rat->Point1.X, Rat->Point1.Y, Rat->Point2.X, Rat->Point2.Y, Index: trunk/src/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c =================================================================== --- trunk/src/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 992) +++ trunk/src/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 993) @@ -136,7 +136,7 @@ select(s, OM_POLYGON, flag, layer->Polygon); } select(s, OM_VIA, flag, PCB->Data->Via); -// select(s, OM_PIN, flag, PCB->Data->Pin, PCB->Data->PinN); /* TODO */ +/* select(s, OM_PIN, flag, PCB->Data->Pin, PCB->Data->PinN); /* TODO */ return s->used; } Index: trunk/src/pcb-mincut/load.c =================================================================== --- trunk/src/pcb-mincut/load.c (revision 992) +++ trunk/src/pcb-mincut/load.c (revision 993) @@ -23,7 +23,7 @@ #include "genht/htsi.h" #include "graph.h" -//#define DEBUG_GR +/*#define DEBUG_GR*/ /* maximum number of nodes */ #define MAXNODES 1024 Index: trunk/src/pcb-mincut/solve.c =================================================================== --- trunk/src/pcb-mincut/solve.c (revision 992) +++ trunk/src/pcb-mincut/solve.c (revision 993) @@ -27,9 +27,9 @@ #define BAD 1000000 -//#define DEBUG_MERGES -//#define DEBUG_TAGS -//#define DEBUG_SOLVE +/*#define DEBUG_MERGES*/ +/*#define DEBUG_TAGS*/ +/*#define DEBUG_SOLVE*/ typedef struct { gr_t *g; Index: trunk/src/polygon1.c =================================================================== --- trunk/src/polygon1.c (revision 992) +++ trunk/src/polygon1.c (revision 993) @@ -2496,7 +2496,7 @@ res = (VNODE *) calloc (1, sizeof (VNODE)); if (res == NULL) return NULL; - // bzero (res, sizeof (VNODE) - sizeof(Vector)); + /* bzero (res, sizeof (VNODE) - sizeof(Vector)); */ c = res->point; *c++ = *v++; *c = *v; @@ -2736,7 +2736,7 @@ { if ((newnode = poly_CreateNode (cur->point)) == NULL) return FALSE; - // newnode->Flags = cur->Flags; + /* newnode->Flags = cur->Flags;*/ poly_InclVertex ((*dst)->head.prev, newnode); } (*dst)->tree = (rtree_t *)make_edge_tree (*dst);