diff options
| -rw-r--r-- | fonttosfnt.c | 4 | ||||
| -rw-r--r-- | read.c | 5 | ||||
| -rw-r--r-- | util.c | 15 |
3 files changed, 16 insertions, 8 deletions
diff --git a/fonttosfnt.c b/fonttosfnt.c index 375fdb3..ca11696 100644 --- a/fonttosfnt.c +++ b/fonttosfnt.c @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.4 2003/12/19 02:16:36 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -34,7 +34,7 @@ int crop_flag = 1; int bit_aligned_flag = 1; static void -usage() +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, @@ -19,13 +19,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.4 2003/11/21 05:22:09 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 dawes Exp $ */ #include <stdio.h> #include <ft2build.h> #include FT_FREETYPE_H #include FT_BDF_H +#include "X11/Xos.h" #include "fonttosfnt.h" #include "fontenc.h" @@ -38,7 +39,7 @@ static int ft_inited = 0; static FT_Library ft_library; static int -FT_Ensure_Inited() +FT_Ensure_Inited(void) { int rc; if(ft_inited) @@ -19,7 +19,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.8 2003/11/21 05:22:09 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.11 2003/12/19 02:16:36 dawes Exp $ */ #include <time.h> #include <string.h> @@ -36,8 +36,15 @@ THE SOFTWARE. #include FT_FREETYPE_H #include FT_INTERNAL_OBJECTS_H #include FT_BDF_H +#include "X11/Xos.h" #include "fonttosfnt.h" +#ifdef NEED_SNPRINTF +#undef SCOPE +#define SCOPE static +#include "snprintf.c" +#endif + #ifdef __GLIBC__ #define HAVE_TIMEGM #define HAVE_TM_GMTOFF @@ -120,13 +127,13 @@ makeName(char *s) /* Like mktime(3), but UTC rather than local time */ #if defined(HAVE_TIMEGM) -time_t +static time_t mktime_gmt(struct tm *tm) { return timegm(tm); } #elif defined(HAVE_TM_GMTOFF) -time_t +static time_t mktime_gmt(struct tm *tm) { time_t t; @@ -142,7 +149,7 @@ mktime_gmt(struct tm *tm) } #elif defined(HAVE_TZSET) /* Taken from the Linux timegm(3) man page */ -time_t +static time_t mktime_gmt(struct tm *tm) { time_t t; |