X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_glutfont_definitions.c;h=87fdf40b4a83daa4311f858e4e159db4e2a37a26;hb=aa4643b483379e0f1e40b8abc6584363cf395216;hp=81547748c0a775fa7b2a42fadd2cd1def514e3cf;hpb=ca79181e75fe302c7e7aa508d078cbac0ac6a514;p=freeglut diff --git a/src/freeglut_glutfont_definitions.c b/src/freeglut_glutfont_definitions.c index 8154774..87fdf40 100644 --- a/src/freeglut_glutfont_definitions.c +++ b/src/freeglut_glutfont_definitions.c @@ -3,9 +3,10 @@ * * Bitmap and stroke fonts displaying. * - * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not). All Rights Reserved. - * Written by John F. Fay , who releases the copyright over to the - * "freeglut" project lead. + * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not). + * All Rights Reserved. + * Written by John F. Fay , who releases the + * copyright over to the "freeglut" project lead. * Creation date: Mon July 21 2003 * * Permission is hereby granted, free of charge, to any person obtaining a @@ -27,30 +28,30 @@ */ /* - * This file is necessary for the *nix version of "freeglut" because the original GLUT - * defined its font variables in rather an unusual way. Publicly, in "glut.h", they were - * defined as "void *". Privately, in one of the source code files, they were defined as - * pointers to a structure. Most compilers and linkers are satisfied with the "void *" - * and don't go any farther, but some of them balked. In particular, when compiling with - * "freeglut" and then trying to run using the GLUT ".so" library, some of them would give - * an error. So we are having to create this file to define the variables as pointers - * to an unusual structure to match GLUT. + * This file is necessary for the *nix version of "freeglut" because the + * original GLUT defined its font variables in rather an unusual way. + * Publicly, in "glut.h", they were defined as "void *". Privately, + * in one of the source code files, they were defined as pointers to a + * structure. Most compilers and linkers are satisfied with the "void *" + * and don't go any farther, but some of them balked. In particular, + * when compiling with "freeglut" and then trying to run using the GLUT + * ".so" library, some of them would give an error. So we are having to + * create this file to define the variables as pointers to an unusual + * structure to match GLUT. */ #include "freeglut_internal.h" #if TARGET_HOST_UNIX_X11 -#define G_LOG_DOMAIN "freeglut-glutfont-definitions" - struct freeglutStrokeFont -{ +{ const char *name ; int num_chars ; void *ch ; float top ; float bottom ; -} ; +}; struct freeglutBitmapFont { @@ -58,7 +59,7 @@ struct freeglutBitmapFont const int num_chars ; const int first ; const void *ch ; -} ; +}; struct freeglutStrokeFont glutStrokeRoman ;