diff options
| author | Ashish Gupta <ashmew2@gmail.com> | 2017-04-13 23:36:26 +0200 |
|---|---|---|
| committer | Ashish Gupta <ashmew2@gmail.com> | 2017-10-25 22:04:54 +0200 |
| commit | 7fb4c9e101f8477217ce9d818835bab5cc30f484 (patch) | |
| tree | b67b07aec1771eec2a602c82ddd53c62e2d6c5e9 /frontends/kolibrios/fb | |
| parent | a618be2a69a347128a4e29c879abf4a913421f52 (diff) | |
| download | netsurf-7fb4c9e101f8477217ce9d818835bab5cc30f484.tar.gz netsurf-7fb4c9e101f8477217ce9d818835bab5cc30f484.tar.bz2 | |
Step 2 : Abuse _TARGET_IS_KOLIBRIOS and build with make TARGET=kolibrios
Diffstat (limited to 'frontends/kolibrios/fb')
| -rw-r--r-- | frontends/kolibrios/fb/font.h | 1 | ||||
| -rw-r--r-- | frontends/kolibrios/fb/gui.c | 61 | ||||
| -rw-r--r-- | frontends/kolibrios/fb/schedule.c | 7 |
3 files changed, 31 insertions, 38 deletions
diff --git a/frontends/kolibrios/fb/font.h b/frontends/kolibrios/fb/font.h index 8513c93ed..f150e4431 100644 --- a/frontends/kolibrios/fb/font.h +++ b/frontends/kolibrios/fb/font.h @@ -57,7 +57,6 @@ nserror fb_font_position(const struct plot_font_style *fstyle, const char *strin */ nserror fb_font_width(const struct plot_font_style *fstyle, const char *string, size_t length, int *width); - #ifdef KOLIBRI_USE_FREETYPE #include "kolibrios/fb/font_freetype.h" #else diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c index 4d4c7334f..dd5ef71ab 100644 --- a/frontends/kolibrios/fb/gui.c +++ b/frontends/kolibrios/fb/gui.c @@ -55,7 +55,6 @@ #include "framebuffer/fetch.h" #include "framebuffer/bitmap.h" - #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrutc" fbtk_widget_t *fbtk; @@ -485,36 +484,36 @@ process_cmdline(int argc, char** argv) feurl = NETSURF_HOMEPAGE; } - while((opt = getopt_long(argc, argv, "f:b:w:h:", - long_options, &option_index)) != -1) { - switch (opt) { - case 'f': - fename = optarg; - break; - - case 'b': - febpp = atoi(optarg); - break; - - case 'w': - fewidth = atoi(optarg); - break; - - case 'h': - feheight = atoi(optarg); - break; - - default: - fprintf(stderr, - "Usage: %s [-f frontend] [-b bpp] url\n", - argv[0]); - return false; - } - } - - if (optind < argc) { - feurl = argv[optind]; - } + /* while((opt = getopt_long(argc, argv, "f:b:w:h:", */ + /* long_options, &option_index)) != -1) { */ + /* switch (opt) { */ + /* case 'f': */ + /* fename = optarg; */ + /* break; */ + + /* case 'b': */ + /* febpp = atoi(optarg); */ + /* break; */ + + /* case 'w': */ + /* fewidth = atoi(optarg); */ + /* break; */ + + /* case 'h': */ + /* feheight = atoi(optarg); */ + /* break; */ + + /* default: */ + /* fprintf(stderr, */ + /* "Usage: %s [-f frontend] [-b bpp] url\n", */ + /* argv[0]); */ + /* return false; */ + /* } */ + /* } */ + + /* if (optind < argc) { */ + /* feurl = argv[optind]; */ + /* } */ return true; } diff --git a/frontends/kolibrios/fb/schedule.c b/frontends/kolibrios/fb/schedule.c index 3a3bda63f..72baa988e 100644 --- a/frontends/kolibrios/fb/schedule.c +++ b/frontends/kolibrios/fb/schedule.c @@ -15,12 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _TARGET_IS_KOLIBRIOS -#define _TARGET_IS_KOLIBRIOS -#endif - -#ifdef _TARGET_IS_KOLIBRIOS - +#if defined(_TARGET_IS_KOLIBRIOS) #define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) |