Skip to content

Commit dd69860

Browse files
committed
compilation
1 parent 95b3255 commit dd69860

File tree

6 files changed

+43
-43
lines changed

6 files changed

+43
-43
lines changed

pens/main/_xt.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ extern int in_repaint; /* Are we in the repaint proc ? */
7676
extern int num_files;
7777

7878
/* Button functions */
79-
extern void create_buttons();
80-
extern void activate_buttons();
81-
extern void inactivate_buttons();
79+
/*extern void create_buttons(); */
80+
extern void activate_buttons(void);
81+
extern void inactivate_buttons(void);
8282
extern int epause; /* user sepcified pause in seconds */
8383
extern float fpause; /* pause between frames in seconds */
8484

pens/main/dovplot.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ extern vp_plotstyle default_style;
212212
extern int default_txfont, default_txprec, default_txovly;
213213
extern bool default_overlay;
214214
extern int color_set[MAX_COL + 1][_NUM_PRIM];
215-
extern int greycorr ();
216215
extern int num_col_8;
217216
extern int xret, yret;
218217
extern char interact[];
@@ -226,8 +225,8 @@ int ras_allgrey = YES;
226225

227226
#include <stdlib.h>
228227

229-
long int ftell ();
230-
extern void wlimit ();
228+
/*long int ftell ();
229+
extern void wlimit (); */
231230

232231
int need_devcolor = NO;
233232

pens/main/oglpen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ void oglerase (int command)
379379
glDisable (GL_CLIP_PLANE3);
380380
}
381381

382-
void oglstartanimation ()
382+
void oglstartanimation (void)
383383
{
384384
/*< start animation >*/
385385
animate = true;

pens/main/pspen.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,6 @@ void opendev (int argc, char* argv[])
13291329
int i;
13301330
char units;
13311331
float unitscale=1.;
1332-
extern int isafile ();
13331332
struct stat statbuf;
13341333
int creatafile;
13351334
bool yesget;

pens/main/x11pen.c

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,38 @@ unsigned long map[256] = { U0, U0, U0, U0, U0, U0, U0, U0,
245245
U0, U0, U0, U0, U0, U0, U0, U0,
246246
U0, U0, U0, U0, U0, U0, U0, U0 };
247247

248+
/* routine to find display server; check getpar */
249+
Display *OpenDisplay (void)
250+
{
251+
char name[50], *host;
252+
Display *display;
253+
254+
display = NULL;
255+
256+
/* check getpar first */
257+
host = sf_getstring("server"); /* X server */
258+
if (NULL != host)
259+
{
260+
display = XOpenDisplay (host);
261+
if (display != NULL)
262+
sf_warning ("X-server=%s", DisplayString(display));
263+
else /* add :0 to getpar name */
264+
{
265+
sprintf (name, "%s:0", host);
266+
display = XOpenDisplay (name);
267+
if (display != NULL)
268+
fprintf (stderr, "X-server=%s\n", DisplayString(display));
269+
}
270+
return (display);
271+
}
272+
273+
display = XOpenDisplay(NULL);
274+
if (display != NULL)
275+
sf_warning ("X-server=%s", DisplayString(display));
276+
return(display);
277+
}
278+
279+
248280
void xattributes (int command, int v, int v1, int v2, int v3)
249281
/*< attributes >*/
250282
{
@@ -436,7 +468,6 @@ void opendev (int argc, char* argv[])
436468
{
437469
int win_x, win_y, i;
438470
char title[50], *ap, *option;
439-
Display *OpenDisplay ();
440471
XEvent event;
441472

442473
dev.erase = xerase;
@@ -569,36 +600,6 @@ void opendev (int argc, char* argv[])
569600
}
570601
}
571602

572-
/* routine to find display server; check getpar */
573-
Display *OpenDisplay ()
574-
{
575-
char name[50], *host;
576-
Display *display;
577-
578-
display = NULL;
579-
580-
/* check getpar first */
581-
host = sf_getstring("server"); /* X server */
582-
if (NULL != host)
583-
{
584-
display = XOpenDisplay (host);
585-
if (display != NULL)
586-
sf_warning ("X-server=%s", DisplayString(display));
587-
else /* add :0 to getpar name */
588-
{
589-
sprintf (name, "%s:0", host);
590-
display = XOpenDisplay (name);
591-
if (display != NULL)
592-
fprintf (stderr, "X-server=%s\n", DisplayString(display));
593-
}
594-
return (display);
595-
}
596-
597-
display = XOpenDisplay(NULL);
598-
if (display != NULL)
599-
sf_warning ("X-server=%s", DisplayString(display));
600-
return(display);
601-
}
602603

603604
void xplot (int x, int y, int draw)
604605
/*< plot >*/

pens/main/xtpen.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ static int didFRAM1 = NO, didRUN = NO, didSTOP=NO , didCHANGE = NO;
10781078
static int next_on=NO ,prev_on=NO ,quit_on=NO ,restart_on=NO ;
10791079
static int run_on=NO , stop_on=NO, size_on=NO;
10801080

1081-
static void dummy_proc () { return; }
1081+
static void dummy_proc (void) { return; }
10821082

10831083
void actionDummy(Widget w, XEvent ev, String *p, Cardinal *np)
10841084
/*< dummy >*/
@@ -1207,7 +1207,8 @@ static void set_delay_label(float delay)
12071207
/* procs to set pause between frames, these are not currently set as
12081208
* button callbacks but they may be used in a translation table
12091209
*/
1210-
static void slower_proc(){
1210+
static void slower_proc(void)
1211+
{
12111212
if( fpause==0. ) fpause =.25;
12121213
else fpause = fpause*2.;
12131214
if( fpause >=10. ) fpause =9.99;
@@ -1415,7 +1416,7 @@ void create_panel(Widget parent,bool want_buttons,bool want_labels)
14151416
return;
14161417
}
14171418

1418-
void activate_buttons()
1419+
void activate_buttons(void)
14191420
{
14201421
if( wantButtons ){
14211422
/* turn on the buttons, if required */
@@ -1431,7 +1432,7 @@ void activate_buttons()
14311432
return;
14321433
}
14331434

1434-
void inactivate_buttons()
1435+
void inactivate_buttons(void)
14351436
{
14361437
/* turn all the buttons off */
14371438

0 commit comments

Comments
 (0)