Skip to content

Commit 621d496

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents f3f9ab8 + 8740455 commit 621d496

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ $(OBJDIR)/switch.o: $(PLATFORM_SRC_DIR)/switch.cxx
460460
endif
461461

462462
$(OBJDIR)/getdate.tab.o: $(GETDATE_SOURCE)
463-
$(Q_CC)$(CC) -Wno-write-strings $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
463+
$(Q_CC)$(CC) -Wno-write-strings -std=c99 $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
464464

465465
$(DEPDIR)/getdate.tab.dep: $(GETDATE_SOURCE)
466466
$(Q_CC)$(CC) $(STDCCFLAGS) -M $< >> $@

tools/configure/configure.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include <io.h>
4545

4646

47-
#define VERSION "1.21"
47+
#define VERSION "1.22"
4848

4949
static char * VersionTags[] = { "MAJOR_VERSION", "MINOR_VERSION", "BUILD_NUMBER", "BUILD_TYPE" };
5050

@@ -630,7 +630,7 @@ bool AllFeaturesAre(bool state, const list<string> & features, string & breaker)
630630
int main(int argc, char* argv[])
631631
{
632632
// open and scan configure.ac
633-
cout << "PWLib Configure " VERSION " - ";
633+
cout << "PTLib Configure " VERSION " - ";
634634
ifstream conf("configure.ac", ios::in);
635635
if (conf.is_open()) {
636636
cout << "opened configure.ac" << endl;

0 commit comments

Comments
 (0)