diff options
| -rw-r--r-- | src/flstring.h | 10 | ||||
| -rw-r--r-- | src/makedepend | 83 | ||||
| -rw-r--r-- | src/vsnprintf.c | 11 |
3 files changed, 12 insertions, 92 deletions
diff --git a/src/flstring.h b/src/flstring.h index 24b466585..b03a472ae 100644 --- a/src/flstring.h +++ b/src/flstring.h @@ -1,5 +1,5 @@ /* - * "$Id: flstring.h,v 1.1.2.2 2002/01/15 01:33:16 easysw Exp $" + * "$Id: flstring.h,v 1.1.2.3 2002/03/25 21:55:05 easysw Exp $" * * Common string header file for the Fast Light Tool Kit (FLTK). * @@ -53,11 +53,13 @@ extern "C" { # endif /* __cplusplus */ # if !HAVE_SNPRINTF -extern int snprintf(char *, size_t, const char *, ...); +extern int fl_snprintf(char *, size_t, const char *, ...); +# define snprintf fl_snprintf # endif /* !HAVE_SNPRINTF */ # if !HAVE_VSNPRINTF -extern int vsnprintf(char *, size_t, const char *, va_list ap); +extern int fl_vsnprintf(char *, size_t, const char *, va_list ap); +# define vsnprintf fl_vsnprintf # endif /* !HAVE_VSNPRINTF */ # ifdef __cplusplus @@ -66,5 +68,5 @@ extern int vsnprintf(char *, size_t, const char *, va_list ap); #endif /* !flstring_h */ /* - * End of "$Id: flstring.h,v 1.1.2.2 2002/01/15 01:33:16 easysw Exp $". + * End of "$Id: flstring.h,v 1.1.2.3 2002/03/25 21:55:05 easysw Exp $". */ diff --git a/src/makedepend b/src/makedepend index bf67e02dc..43c2bbac7 100644 --- a/src/makedepend +++ b/src/makedepend @@ -373,87 +373,6 @@ fl_symbols.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_symbols.o: ../FL/fl_draw.H fl_vertex.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/x.H fl_vertex.o: ../FL/Fl_Window.H ../FL/math.h -forms_compatability.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_compatability.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_compatability.o: ../FL/Fl_Window.H ../FL/fl_draw.H -forms_compatability.o: ../FL/Fl_FormsBitmap.H ../FL/Fl_Bitmap.H -forms_compatability.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_FormsPixmap.H -forms_compatability.o: ../FL/Fl_Pixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H -forms_compatability.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -forms_compatability.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -forms_compatability.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H -forms_compatability.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H -forms_compatability.o: ../FL/Fl_Chart.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H -forms_compatability.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H -forms_compatability.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H -forms_compatability.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H -forms_compatability.o: ../FL/filename.H ../FL/Fl_File_Chooser.H ../FL/Fl.H -forms_compatability.o: ../FL/Fl_Window.H ../FL/Fl_File_Browser.H -forms_compatability.o: ../FL/Fl_File_Icon.H ../FL/Fl_Button.H -forms_compatability.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H -forms_compatability.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H -forms_compatability.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H -forms_compatability.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H -forms_compatability.o: ../FL/Fl_Timer.H ../FL/Fl_Repeat_Button.H -forms_bitmap.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_bitmap.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_bitmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H -forms_bitmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H -forms_bitmap.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H ../FL/Fl_Box.H -forms_bitmap.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -forms_bitmap.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Button.H -forms_bitmap.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H -forms_bitmap.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H -forms_bitmap.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H -forms_bitmap.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H -forms_bitmap.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H ../FL/filename.H -forms_bitmap.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Window.H -forms_bitmap.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H -forms_bitmap.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H -forms_bitmap.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H -forms_bitmap.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H -forms_bitmap.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H -forms_free.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -forms_free.o: ../FL/Fl_Free.H ../FL/Fl_Widget.H -forms_fselect.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_fselect.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_fselect.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H -forms_fselect.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H -forms_fselect.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H ../FL/Fl_Box.H -forms_fselect.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -forms_fselect.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Button.H -forms_fselect.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H -forms_fselect.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H -forms_fselect.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H -forms_fselect.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H -forms_fselect.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H ../FL/filename.H -forms_fselect.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Window.H -forms_fselect.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H -forms_fselect.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H -forms_fselect.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H -forms_fselect.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H -forms_fselect.o: ../FL/Fl_Positioner.H ../FL/Fl_Value_Slider.H -forms_fselect.o: ../FL/Fl_Timer.H -forms_pixmap.o: ../FL/forms.H ../FL/Fl.H ../FL/Enumerations.H -forms_pixmap.o: ../FL/Fl_Export.H ../FL/Fl_Group.H ../FL/Fl_Widget.H -forms_pixmap.o: ../FL/Fl_Window.H ../FL/fl_draw.H ../FL/Fl_FormsBitmap.H -forms_pixmap.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/x.H -forms_pixmap.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Pixmap.H ../FL/Fl_Box.H -forms_pixmap.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H -forms_pixmap.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Button.H -forms_pixmap.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H -forms_pixmap.o: ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H ../FL/Fl_Choice.H -forms_pixmap.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H ../FL/Fl_Clock.H -forms_pixmap.o: ../FL/Fl_Counter.H ../FL/Fl_Dial.H ../FL/Fl_Free.H -forms_pixmap.o: ../FL/fl_ask.H ../FL/fl_show_colormap.H ../FL/filename.H -forms_pixmap.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Window.H -forms_pixmap.o: ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H -forms_pixmap.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H -forms_pixmap.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Choice.H -forms_pixmap.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H -forms_pixmap.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Timer.H -forms_timer.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H -forms_timer.o: ../FL/Fl_Timer.H ../FL/Fl_Widget.H ../FL/fl_draw.H Fl_Gl_Choice.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Gl_Choice.o: ../FL/x.H ../FL/Fl_Window.H Fl_Gl_Choice.H Fl_Gl_Overlay.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H @@ -477,4 +396,4 @@ glut_font.o: ../FL/Fl_Export.H ../FL/Fl.H ../FL/Fl_Gl_Window.H glut_font.o: ../FL/Fl_Window.H scandir.o: ../config.h numericsort.o: ../config.h -vsnprintf.o: ../config.h +vsnprintf.o: flstring.h ../config.h diff --git a/src/vsnprintf.c b/src/vsnprintf.c index 4698bd630..ab83a7b02 100644 --- a/src/vsnprintf.c +++ b/src/vsnprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: vsnprintf.c,v 1.3.2.5.2.1 2002/01/01 15:11:32 easysw Exp $" + * "$Id: vsnprintf.c,v 1.3.2.5.2.2 2002/03/25 21:55:05 easysw Exp $" * * vsnprintf() function for the Fast Light Tool Kit (FLTK). * @@ -38,8 +38,7 @@ */ #include <stdio.h> -#include <stdarg.h> -#include <config.h> +#include "flstring.h" #ifdef HAVE_SYS_STDTYPES_H # include <sys/stdtypes.h> @@ -51,7 +50,7 @@ extern "C" { #if !HAVE_VSNPRINTF -int vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { +int fl_vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { const char* e = str+size-1; char* p = str; char copy[20]; @@ -119,7 +118,7 @@ int vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { #if !HAVE_SNPRINTF -int snprintf(char* str, size_t size, const char* fmt, ...) { +int fl_snprintf(char* str, size_t size, const char* fmt, ...) { int ret; va_list ap; va_start(ap, fmt); @@ -135,6 +134,6 @@ int snprintf(char* str, size_t size, const char* fmt, ...) { #endif /* - * End of "$Id: vsnprintf.c,v 1.3.2.5.2.1 2002/01/01 15:11:32 easysw Exp $". + * End of "$Id: vsnprintf.c,v 1.3.2.5.2.2 2002/03/25 21:55:05 easysw Exp $". */ |