diff options
| -rw-r--r-- | env.c | 2 | ||||
| -rw-r--r-- | fonttosfnt.c | 3 | ||||
| -rw-r--r-- | fonttosfnt.h | 2 | ||||
| -rw-r--r-- | fonttosfnt.man | 2 | ||||
| -rw-r--r-- | read.c | 6 | ||||
| -rw-r--r-- | struct.c | 2 | ||||
| -rw-r--r-- | util.c | 16 | ||||
| -rw-r--r-- | write.c | 2 |
8 files changed, 23 insertions, 12 deletions
@@ -36,7 +36,7 @@ * SUCH DAMAGE. */ -/* $XFree86: xc/programs/fonttosfnt/env.c,v 1.1 2003/07/08 15:39:49 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/env.c,v 1.1 2002/03/05 03:52:34 dawes Exp $ */ #include <stdlib.h> diff --git a/fonttosfnt.c b/fonttosfnt.c index 375fdb3..0a90b01 100644 --- a/fonttosfnt.c +++ b/fonttosfnt.c @@ -19,6 +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. */ +/* $XdotOrg: xc/programs/fonttosfnt/fonttosfnt.c,v 1.1.4.1.4.2 2004/03/04 19:42:54 kaleb Exp $ */ /* $XFree86: xc/programs/fonttosfnt/fonttosfnt.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */ #include <stdio.h> @@ -34,7 +35,7 @@ int crop_flag = 1; int bit_aligned_flag = 1; static void -usage() +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, diff --git a/fonttosfnt.h b/fonttosfnt.h index 128d2cc..b7392a7 100644 --- a/fonttosfnt.h +++ b/fonttosfnt.h @@ -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.h,v 1.5 2003/11/21 05:22:09 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/fonttosfnt.h,v 1.4 2003/10/24 20:38:11 tsi Exp $ */ #ifndef _FONTTOSFNT_H_ #define _FONTTOSFNT_H_ 1 diff --git a/fonttosfnt.man b/fonttosfnt.man index e4c72b1..3a189cf 100644 --- a/fonttosfnt.man +++ b/fonttosfnt.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/fonttosfnt/fonttosfnt.man,v 1.3 2003/07/08 15:39:49 tsi Exp $ +.\" $XFree86$ .TH FONTTOSFNT 1 __vendorversion__ .SH NAME fonttosfnt \- Wrap a bitmap font in a sfnt (TrueType) wrapper @@ -19,13 +19,15 @@ 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 $ */ +/* $XdotOrg: xc/programs/fonttosfnt/read.c,v 1.1.4.1.4.2 2004/03/04 19:45:27 kaleb Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.5 2003/12/19 02:05:39 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 +40,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/struct.c,v 1.4 2003/11/21 05:22:09 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/struct.c,v 1.3 2003/10/24 20:38:11 tsi Exp $ */ #include <stdlib.h> #include <stdio.h> @@ -19,7 +19,8 @@ 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 $ */ +/* $XdotOrg: xc/programs/fonttosfnt/util.c,v 1.1.4.1.4.2 2004/03/04 19:45:27 kaleb Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */ #include <time.h> #include <string.h> @@ -36,8 +37,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 +128,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 +150,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; @@ -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/write.c,v 1.5 2003/10/24 20:38:11 tsi Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/write.c,v 1.4tsi Exp $ */ #if defined(linux) && !defined(_GNU_SOURCE) /* for fwrite_unlocked and fread_unlocked */ |